changeset 12355:9afd83a7eeeb

[gaim-migrate @ 14659] a pair of translation updates committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Mon, 05 Dec 2005 18:58:17 +0000 (2005-12-05)
parents 709548d845a1
children 4b8c20fcecd6
files po/ChangeLog po/pt_BR.po po/sl.po
diffstat 3 files changed, 7204 insertions(+), 6953 deletions(-) [+]
line wrap: on
line diff
--- a/po/ChangeLog	Mon Dec 05 16:44:46 2005 +0000
+++ b/po/ChangeLog	Mon Dec 05 18:58:17 2005 +0000
@@ -14,7 +14,8 @@
 	* Greek translation added (Bouklis Panos)
 	* Hebrew translation updated (Shalom Craimer)
 	* Kurdish translation added (Erdal Ronahi and Amed �. Jiyan)
-	* Portuguese (Brazilian) translation updated (Rodrigo Torres)
+	* Portuguese (Brazilian) translation updated (Rodrigo Torres,  Mauricio de
+	  L R Collares Neto)
 	* Slovenian translation updated (Martin Srebotnjak)
 	* Telugu translation added (Mr. Subbaramaih)
 	* Ukrainian translation updated (Maxim V. Dziumanenko)
--- a/po/pt_BR.po	Mon Dec 05 16:44:46 2005 +0000
+++ b/po/pt_BR.po	Mon Dec 05 18:58:17 2005 +0000
@@ -1,5 +1,5 @@
 # Gaim Portuguese (Brazilian) translation
-# Copyright (C) 2003-2004, Maur鱈cio de Lemos Rodrigues Collares Neto <mauricioc@gmail.com>
+# Copyright (C) 2003-2005, Maur鱈cio de Lemos Rodrigues Collares Neto <mauricioc@gmail.com>
 # This file is distributed under the same license as the Gaim package.
 # 
 # 
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: Gaim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-27 16:12-0400\n"
-"PO-Revision-Date: 2005-08-19 17:43-0300\n"
+"POT-Creation-Date: 2005-11-20 01:20-0200\n"
+"PO-Revision-Date: 2005-11-20 01:22-0300\n"
 "Last-Translator: Maur鱈cio de Lemos Rodrigues Collares Neto <mauricioc@gmail."
 "com>\n"
 "Language-Team: Maur鱈cio de Lemos Rodrigues Collares Neto <mauricioc@gmail."
@@ -18,40 +18,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: plugins/autorecon.c:301
-msgid "Error Message Suppression"
-msgstr "Supress達o de mensagens de erro"
-
-#: plugins/autorecon.c:305
-msgid "Hide Disconnect Errors"
-msgstr "Ocultar mensagens de desconex達o"
-
-#: plugins/autorecon.c:309
-msgid "Hide Login Errors"
-msgstr "Esconder erros de conex達o"
-
-#: plugins/autorecon.c:313
-msgid "Hide Reconnecting Dialog"
-msgstr "Ocultar janela de reconex達o"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/autorecon.c:337
-msgid "Auto-Reconnect"
-msgstr "Auto-reconectar"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/autorecon.c:340 plugins/autorecon.c:342
-msgid "When you are kicked offline, this reconnects you."
-msgstr "Quando voc棚 辿 desconectado, este plugin te reconecta."
-
 #: plugins/contact_priority.c:84
 msgid "Point values to use when..."
 msgstr "Valores pontuais a serem usados quando..."
@@ -118,6 +84,77 @@
 "Permite controlar os valores pontuais dos status de inativo/ausente/"
 "desconectado para amigos na computa巽達o da prioridade dos contatos."
 
+#: plugins/docklet/docklet.c:293
+msgid "Show Buddy List"
+msgstr "Mostrar lista de amigos"
+
+#: plugins/docklet/docklet.c:300
+msgid "New Message..."
+msgstr "Nova mensagem..."
+
+#: plugins/docklet/docklet.c:304
+msgid "Join A Chat..."
+msgstr "Entrar em um bate-papo..."
+
+#: plugins/docklet/docklet.c:309
+msgid "Mute Sounds"
+msgstr "N達o tocar sons"
+
+#: plugins/docklet/docklet.c:316 src/gtkft.c:693
+#: src/protocols/oscar/oscar.c:8328
+msgid "File Transfers"
+msgstr "Transfer棚ncias de arquivos"
+
+#: plugins/docklet/docklet.c:317 src/gtkaccount.c:2434
+msgid "Accounts"
+msgstr "Contas"
+
+#: plugins/docklet/docklet.c:318 src/gtkprefs.c:1782
+msgid "Preferences"
+msgstr "Prefer棚ncias"
+
+#: plugins/docklet/docklet.c:319 src/gtkplugin.c:352
+msgid "Plugins"
+msgstr "Plugins"
+
+#. TODO: need a submenu to change status, this needs to "link"
+#. * to the status in the buddy list gtkstatusbox
+#.
+#: plugins/docklet/docklet.c:327
+msgid "Quit"
+msgstr "Fechar"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/docklet/docklet.c:457
+msgid "System Tray Icon"
+msgstr "�cone da bandeja"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/docklet/docklet.c:460
+msgid "Displays an icon for Gaim in the system tray."
+msgstr "Exibe um 鱈cone do Gaim na bandeja do sistema."
+
+#. *  description
+#: plugins/docklet/docklet.c:462
+msgid ""
+"Displays a system tray icon (in GNOME, KDE or Windows for example) to show "
+"the current status of Gaim, allow fast access to commonly used functions, "
+"and to toggle display of the buddy list or login window. Also allows "
+"messages to be queued until the icon is clicked, similar to ICQ."
+msgstr ""
+"Exibe um 鱈cone de bandeja (no GNOME, KDE ou no Windows, por exemplo) para "
+"mostrar o status atual do Gaim, permitir acesso r叩pido a fun巽探es comumente "
+"utilizadas, e para exibir ou ocultar a lista de amigos ou a tela de conex達o. "
+"Permite tamb辿m que mensagens fiquem ocultas at辿 que o 鱈cone seja clicado, "
+"como no ICQ."
+
 #.
 #. *  DEFINES, MACROS & DATA TYPES
 #.
@@ -133,74 +170,6 @@
 msgid "Gaim - Away"
 msgstr "Gaim - Ausente"
 
-#: plugins/docklet/docklet.c:383
-#, fuzzy
-msgid "Show Buddy List"
-msgstr "Lista de amigos"
-
-#: plugins/docklet/docklet.c:390
-msgid "New Message..."
-msgstr "Nova mensagem..."
-
-#: plugins/docklet/docklet.c:394
-msgid "Join A Chat..."
-msgstr "Entrar em um bate-papo..."
-
-#: plugins/docklet/docklet.c:399
-msgid "Mute Sounds"
-msgstr "N達o tocar sons"
-
-#: plugins/docklet/docklet.c:406 src/gtkft.c:691
-#: src/protocols/oscar/oscar.c:8357
-msgid "File Transfers"
-msgstr "Transfer棚ncias de arquivos"
-
-#: plugins/docklet/docklet.c:407 src/gtkaccount.c:2422
-msgid "Accounts"
-msgstr "Contas"
-
-#: plugins/docklet/docklet.c:408 src/gtkprefs.c:1763
-msgid "Preferences"
-msgstr "Prefer棚ncias"
-
-#. TODO: need a submenu to change status, this needs to "link"
-#. * to the status in the buddy list gtkstatusbox
-#.
-#: plugins/docklet/docklet.c:416
-msgid "Quit"
-msgstr "Fechar"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/docklet/docklet.c:556
-msgid "System Tray Icon"
-msgstr "�cone da bandeja"
-
-#. *< name
-#. *< version
-#. *  summary
-#: plugins/docklet/docklet.c:559
-msgid "Displays an icon for Gaim in the system tray."
-msgstr "Exibe um 鱈cone do Gaim na bandeja do sistema."
-
-#. *  description
-#: plugins/docklet/docklet.c:561
-msgid ""
-"Displays a system tray icon (in GNOME, KDE or Windows for example) to show "
-"the current status of Gaim, allow fast access to commonly used functions, "
-"and to toggle display of the buddy list or login window. Also allows "
-"messages to be queued until the icon is clicked, similar to ICQ."
-msgstr ""
-"Exibe um 鱈cone de bandeja (no GNOME, KDE ou no Windows, por exemplo) para "
-"mostrar o status atual do Gaim, permitir acesso r叩pido a fun巽探es comumente "
-"utilizadas, e para exibir ou ocultar a lista de amigos ou a tela de conex達o. "
-"Permite tamb辿m que mensagens fiquem ocultas at辿 que o 鱈cone seja clicado, "
-"como no ICQ."
-
 #: plugins/extplacement.c:79
 msgid "By conversation count"
 msgstr "Por n炭mero de conversas"
@@ -294,74 +263,83 @@
 "- Manda uma mensagem para as pessoas na sua lista imediatamente quando elas "
 "se conectam"
 
-#: plugins/gaimrc.c:40
+#: plugins/gaimrc.c:41
 msgid "Cursor Color"
 msgstr "Cor do cursor"
 
-#: plugins/gaimrc.c:41
-msgid "Secondary Cursor Color"
-msgstr "Cor secund叩ria do cursor"
-
 #: plugins/gaimrc.c:42
+msgid "Secondary Cursor Color"
+msgstr "Cor secund叩ria do cursor"
+
+#: plugins/gaimrc.c:43
 msgid "Hyperlink Color"
 msgstr "Cor do hyperlink"
 
-#: plugins/gaimrc.c:53
+#: plugins/gaimrc.c:54
 msgid "GtkTreeView Expander Size"
 msgstr "Tamanho do expansor do GtkTreeView"
 
-#: plugins/gaimrc.c:72
+#: plugins/gaimrc.c:73
 #, fuzzy
 msgid "Conversation Entry"
 msgstr "Conversas"
 
-#: plugins/gaimrc.c:73
+#: plugins/gaimrc.c:74
 msgid "Conversation History"
 msgstr "Hist坦rico das conversas"
 
-#: plugins/gaimrc.c:74
-msgid "Log Viewer"
-msgstr "Visualizador de logs"
-
 #: plugins/gaimrc.c:75
-msgid "Request Dialog"
-msgstr "Di叩logo de requisi巽達o"
+msgid "Log Viewer"
+msgstr "Visualizador de logs"
 
 #: plugins/gaimrc.c:76
+msgid "Request Dialog"
+msgstr "Di叩logo de requisi巽達o"
+
+#: plugins/gaimrc.c:77
 msgid "Notify Dialog"
 msgstr "Di叩logo de notifica巽達o"
 
-#: plugins/gaimrc.c:209
+#: plugins/gaimrc.c:280
 #, c-format
 msgid "Select Color for %s"
 msgstr "Selecionar cor para %s"
 
-#: plugins/gaimrc.c:211
+#: plugins/gaimrc.c:282
 msgid "Select Color"
 msgstr "Selecionar cor"
 
-#: plugins/gaimrc.c:246
+#: plugins/gaimrc.c:317
 #, c-format
 msgid "Select Font for %s"
 msgstr "Selecionar fonte para %s"
 
-#: plugins/gaimrc.c:284
+#: plugins/gaimrc.c:355
 msgid "Select Interface Font"
 msgstr "Selecionar fonte da interface"
 
-#: plugins/gaimrc.c:343
+#: plugins/gaimrc.c:415
 msgid "GTK+ Interface Font"
 msgstr "Fonte de interface do GTK+"
 
-#: plugins/gaimrc.c:362
+#: plugins/gaimrc.c:434
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Tema de atalho de texto do GTK+"
 
-#: plugins/gaimrc.c:460
+#: plugins/gaimrc.c:517
+#, c-format
+msgid "Write a gtkrc file with these settings to %s"
+msgstr "Escreva um arquivo gtkrc com essas configura巽探es em %s"
+
+#: plugins/gaimrc.c:525
+msgid "Re-read gtkrc files"
+msgstr "Reler arquivos gtkrc"
+
+#: plugins/gaimrc.c:551
 msgid "Gaim GTK+ Theme Control"
 msgstr "Controle de temas Gtk do Gaim"
 
-#: plugins/gaimrc.c:462 plugins/gaimrc.c:463
+#: plugins/gaimrc.c:553 plugins/gaimrc.c:554
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Fornece acesso � configura巽探es do gtkrc comumente usadas\""
 
@@ -420,8 +398,9 @@
 "conversa."
 
 #: plugins/gevolution/add_buddy_dialog.c:131
-#: plugins/gevolution/assoc-buddy.c:119 src/gtkroomlist.c:572
-#: src/protocols/jabber/jabber.c:638 src/protocols/msn/msn.c:1539
+#: plugins/gevolution/assoc-buddy.c:119 src/gtkplugin.c:388
+#: src/gtkroomlist.c:572 src/protocols/jabber/jabber.c:638
+#: src/protocols/msn/msn.c:1523
 msgid "Name"
 msgstr "Nome"
 
@@ -439,13 +418,13 @@
 #. "Search"
 #: plugins/gevolution/add_buddy_dialog.c:471
 #: plugins/gevolution/assoc-buddy.c:353 src/protocols/jabber/buddy.c:1357
-#: src/protocols/oscar/oscar.c:8128
+#: src/protocols/oscar/oscar.c:8099
 msgid "Search"
 msgstr "Procurar"
 
 #: plugins/gevolution/add_buddy_dialog.c:552
-#: plugins/gevolution/new_person_dialog.c:306 src/gtkblist.c:4082
-#: src/gtkblist.c:4459
+#: plugins/gevolution/new_person_dialog.c:306 src/gtkblist.c:4343
+#: src/gtkblist.c:4723
 msgid "Group:"
 msgstr "Grupo:"
 
@@ -471,17 +450,21 @@
 
 #. Add the expander
 #: plugins/gevolution/assoc-buddy.c:428
-#, fuzzy
 msgid "User _details"
-msgstr "Ocultar detalhes do usu叩rio"
+msgstr "_Detalhes do usu叩rio"
 
 #. "Associate Buddy" button
 #: plugins/gevolution/assoc-buddy.c:481
 msgid "_Associate Buddy"
 msgstr "_Associar amigo"
 
-#: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:96
-#: src/blist.c:518 src/blist.c:1259 src/blist.c:1480 src/gtkblist.c:3897
+#: plugins/gevolution/eds-utils.c:73 plugins/gevolution/eds-utils.c:86
+#: src/protocols/jabber/jabber.c:982 src/protocols/yahoo/yahoo.c:2796
+msgid "None"
+msgstr "Nenhuma"
+
+#: plugins/gevolution/gevolution.c:96 plugins/gevolution/gevo-util.c:64
+#: src/blist.c:518 src/blist.c:1243 src/blist.c:1464 src/gtkblist.c:4158
 #: src/protocols/jabber/roster.c:66
 msgid "Buddies"
 msgstr "Amigos"
@@ -507,17 +490,17 @@
 msgstr "Envia e-mail"
 
 #. Configuration frame
-#: plugins/gevolution/gevolution.c:414
+#: plugins/gevolution/gevolution.c:417
 msgid "Evolution Integration Configuration"
 msgstr "Configura巽達o da integra巽達o com o Evolution"
 
 #. Label
-#: plugins/gevolution/gevolution.c:417
+#: plugins/gevolution/gevolution.c:420
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr ""
 "Selecionar todas as contas onde amigos devem ser adicionados automaticamente."
 
-#: plugins/gevolution/gevolution.c:447 plugins/idle.c:111 plugins/idle.c:140
+#: plugins/gevolution/gevolution.c:450 plugins/idle.c:111 plugins/idle.c:146
 msgid "Account"
 msgstr "Conta"
 
@@ -527,7 +510,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gevolution/gevolution.c:530
+#: plugins/gevolution/gevolution.c:533
 msgid "Evolution Integration"
 msgstr "Integra巽達o com o Evolution"
 
@@ -535,7 +518,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/gevolution/gevolution.c:533 plugins/gevolution/gevolution.c:535
+#: plugins/gevolution/gevolution.c:536 plugins/gevolution/gevolution.c:538
 msgid "Provides integration with Evolution."
 msgstr "Fornece integra巽達o com o Evolution."
 
@@ -561,8 +544,8 @@
 msgstr "Informa巽探es opcionais:"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:337 src/gtkaccount.c:412
-#: src/gtkaccount.c:434 src/protocols/oscar/oscar.c:613
+#: plugins/gevolution/new_person_dialog.c:337 src/gtkaccount.c:409
+#: src/gtkaccount.c:431 src/protocols/oscar/oscar.c:614
 msgid "Buddy Icon"
 msgstr "�cone do amigo"
 
@@ -578,6 +561,26 @@
 msgid "E-mail:"
 msgstr "E-mail:"
 
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/gtk-signals-test.c:107
+msgid "GTK Signals Test"
+msgstr "Teste dos sinais do GTK"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: plugins/gtk-signals-test.c:110 plugins/gtk-signals-test.c:112
+msgid "Test to see that all ui signals are working properly."
+msgstr ""
+"Teste para ver se todos os sinais da interface de usu叩rio est達o funcionando "
+"corretamente."
+
 #: plugins/history.c:146
 msgid "History Plugin Requires Logging"
 msgstr "Plugin hist坦rio requer que gera巽達o de logs"
@@ -642,11 +645,11 @@
 msgid "Minutes"
 msgstr "minutos"
 
-#: plugins/idle.c:122 plugins/idle.c:149 plugins/idle.c:215
+#: plugins/idle.c:122 plugins/idle.c:155 plugins/idle.c:221
 msgid "I'dle Mak'er"
 msgstr "C'riador de ina'tividade"
 
-#: plugins/idle.c:123 plugins/idle.c:181
+#: plugins/idle.c:123
 msgid "Set Account Idle Time"
 msgstr "Definir tempo inativo da conta"
 
@@ -654,29 +657,38 @@
 msgid "_Set"
 msgstr "_Definir"
 
-#: plugins/idle.c:127 plugins/idle.c:154
+#: plugins/idle.c:127 plugins/idle.c:160
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: plugins/idle.c:150 plugins/idle.c:185
-#, fuzzy
+#: plugins/idle.c:140
+msgid "None of your accounts are idle."
+msgstr "Nenhuma das suas contas est叩 inativa."
+
+#: plugins/idle.c:156
 msgid "Unset Account Idle Time"
-msgstr "Definir tempo inativo da conta"
-
-#: plugins/idle.c:153
-#, fuzzy
+msgstr "Redefinir tempo de inatividade da conta"
+
+#: plugins/idle.c:159
 msgid "_Unset"
-msgstr "Desmarcar"
-
-#: plugins/idle.c:190
-msgid "Unset Idle Time For All Idled Accounts"
-msgstr ""
-
-#: plugins/idle.c:217 plugins/idle.c:218
-#, fuzzy
+msgstr "_Redefinir"
+
+#: plugins/idle.c:187
+msgid "Set account idle time"
+msgstr "Definir tempo de inatividade da conta"
+
+#: plugins/idle.c:191
+msgid "Unset account idle time"
+msgstr "Redefinir tempo de inatividade da conta"
+
+#: plugins/idle.c:196
+msgid "Unset idle time for all idled accounts"
+msgstr "Redefinir tempo de inatividade para todas as contas inativas"
+
+#: plugins/idle.c:223 plugins/idle.c:224
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr ""
-"Permite que voc棚 configure manualmente por quanto tempo voc棚 est叩 inativo"
+"Permite que voc棚 configure manualmente por quanto tempo voc棚 esteve inativo"
 
 #. *< type
 #. *< ui_requirement
@@ -742,6 +754,24 @@
 "Adiciona uma pequena caixa � lista de amigos que mostra se voc棚 tem novos "
 "emails."
 
+#: plugins/mono/loader/mono.c:213
+msgid "Mono Plugin Loader"
+msgstr "Carregador de plugins do Mono"
+
+#: plugins/mono/loader/mono.c:215 plugins/mono/loader/mono.c:216
+msgid "Loads .NET plugins with Mono."
+msgstr "Carrega plugins do .NET com o Mono."
+
+#. Configuration frame
+#: plugins/musicmessaging/musicmessaging.c:628
+#, fuzzy
+msgid "Music Messaging Configuration"
+msgstr "Configura巽達o dos gestos do mouse"
+
+#: plugins/musicmessaging/musicmessaging.c:633
+msgid "_Apply"
+msgstr "_Aplicar"
+
 #. ---------- "Notify For" ----------
 #: plugins/notify.c:638
 msgid "Notify For"
@@ -848,15 +878,15 @@
 msgid "Provides support for loading perl plugins."
 msgstr "Fornece suporte ao carregamento de plugins Perl."
 
-#: plugins/raw.c:151
+#: plugins/raw.c:175
 msgid "Raw"
 msgstr "Entrada pura"
 
-#: plugins/raw.c:153
+#: plugins/raw.c:177
 msgid "Lets you send raw input to text-based protocols."
 msgstr "Permite enviar entrada pura para protocolos baseados em texto."
 
-#: plugins/raw.c:154
+#: plugins/raw.c:178
 msgid ""
 "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
@@ -924,7 +954,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:730
+#: plugins/signals-test.c:716
 msgid "Signals Test"
 msgstr "Teste dos sinais"
 
@@ -932,7 +962,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/signals-test.c:733 plugins/signals-test.c:735
+#: plugins/signals-test.c:719 plugins/signals-test.c:721
 msgid "Test to see that all signals are working properly."
 msgstr "Teste para ver se todos os sinais est達o funcionando corretamente."
 
@@ -954,53 +984,51 @@
 msgid "Tests to see that most things are working."
 msgstr "Verifica se a maioria das coisas est達o funcionando."
 
-#: plugins/spellchk.c:1788
+#: plugins/spellchk.c:1800
 msgid "Duplicate Correction"
 msgstr "Corre巽達o duplicada"
 
-#: plugins/spellchk.c:1789
+#: plugins/spellchk.c:1801
 msgid "The specified word already exists in the correction list."
 msgstr "A palavra especificada j叩 existe na lista de corre巽達o"
 
-#: plugins/spellchk.c:1948
+#: plugins/spellchk.c:1981
 msgid "Text Replacements"
 msgstr "Substitui巽達o de texto"
 
-#: plugins/spellchk.c:1972
+#: plugins/spellchk.c:2005
 msgid "You type"
 msgstr "Voc棚 digita"
 
-#: plugins/spellchk.c:1984
+#: plugins/spellchk.c:2017
 msgid "You send"
 msgstr "Voc棚 envia"
 
-#: plugins/spellchk.c:1996
-#, fuzzy
+#: plugins/spellchk.c:2029
 msgid "Whole words only"
-msgstr "Palavras completas"
-
-#: plugins/spellchk.c:2022
+msgstr "Apenas palavras completas"
+
+#: plugins/spellchk.c:2055
 msgid "Add a new text replacement"
 msgstr "Inserir nova substitui巽達o de texto"
 
-#: plugins/spellchk.c:2032
+#: plugins/spellchk.c:2065
 msgid "You _type:"
 msgstr "Voc棚 _digita:"
 
-#: plugins/spellchk.c:2048
+#: plugins/spellchk.c:2081
 msgid "You _send:"
 msgstr "Voc棚 _envia:"
 
-#: plugins/spellchk.c:2060
-#, fuzzy
+#: plugins/spellchk.c:2093
 msgid "Only replace _whole words"
 msgstr "Apenas substituir palavras _completas"
 
-#: plugins/spellchk.c:2097
+#: plugins/spellchk.c:2130
 msgid "Text replacement"
 msgstr "Substitui巽達o de texto"
 
-#: plugins/spellchk.c:2099 plugins/spellchk.c:2100
+#: plugins/spellchk.c:2132 plugins/spellchk.c:2133
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 "Substitui texto nas mensagens enviadas de acordo com regras definidas pelo "
@@ -1012,6 +1040,24 @@
 #. *< dependencies
 #. *< priority
 #. *< id
+#: plugins/ssl/ssl.c:94
+msgid "SSL"
+msgstr "SSL"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: plugins/ssl/ssl.c:97 plugins/ssl/ssl.c:99
+msgid "Provides a wrapper around SSL support libraries."
+msgstr "Fornece um envolt坦rio para as bibliotecas de suporte � SSL."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 #: plugins/ssl/ssl-gnutls.c:227
 msgid "GNUTLS"
 msgstr "GNUTLS"
@@ -1042,35 +1088,17 @@
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Fornece suporte a SSL atrav辿s do Mozilla NSS."
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/ssl/ssl.c:94
-msgid "SSL"
-msgstr "SSL"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/ssl/ssl.c:97 plugins/ssl/ssl.c:99
-msgid "Provides a wrapper around SSL support libraries."
-msgstr "Fornece um envolt坦rio para as bibliotecas de suporte � SSL."
-
-#: plugins/statenotify.c:42
-#, c-format
-msgid "%s has gone away."
-msgstr "%s est叩 ausente."
-
 #: plugins/statenotify.c:49
 #, c-format
 msgid "%s is no longer away."
 msgstr "%s n達o est叩 mais ausente."
 
-#: plugins/statenotify.c:56
+#: plugins/statenotify.c:51
+#, c-format
+msgid "%s has gone away."
+msgstr "%s est叩 ausente."
+
+#: plugins/statenotify.c:61
 #, c-format
 msgid "%s has become idle."
 msgstr "%s se tornou inativo."
@@ -1080,25 +1108,39 @@
 msgid "%s is no longer idle."
 msgstr "%s n達o est叩 mais inativo."
 
-#: plugins/statenotify.c:74
+#: plugins/statenotify.c:72
+#, c-format
+msgid "%s has signed on."
+msgstr "%s conectou."
+
+#: plugins/statenotify.c:79
+#, c-format
+msgid "%s has signed off."
+msgstr "%s desconectou."
+
+#: plugins/statenotify.c:90
 msgid "Notify When"
 msgstr "Notificar quando"
 
-#: plugins/statenotify.c:77
+#: plugins/statenotify.c:93
 msgid "Buddy Goes _Away"
 msgstr "O amigo ficar _ausente"
 
-#: plugins/statenotify.c:80
+#: plugins/statenotify.c:96
 msgid "Buddy Goes _Idle"
 msgstr "O amigo ficar _inativo"
 
+#: plugins/statenotify.c:99
+msgid "Buddy _Signs On/Off"
+msgstr "Amigo conecta/de_sconecta"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/statenotify.c:120
+#: plugins/statenotify.c:139
 msgid "Buddy State Notification"
 msgstr "Notifica巽達o do status do amigo"
 
@@ -1106,7 +1148,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/statenotify.c:123 plugins/statenotify.c:126
+#: plugins/statenotify.c:142 plugins/statenotify.c:145
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
@@ -1128,7 +1170,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ticker/ticker.c:75 plugins/ticker/ticker.c:326
+#: plugins/ticker/ticker.c:75 plugins/ticker/ticker.c:324
 msgid "Buddy Ticker"
 msgstr "Monitor de amigos"
 
@@ -1136,7 +1178,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ticker/ticker.c:329 plugins/ticker/ticker.c:331
+#: plugins/ticker/ticker.c:327 plugins/ticker/ticker.c:329
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Uma vers達o da lista de amigos que rola horizontalmente."
 
@@ -1191,15 +1233,14 @@
 msgstr "_Mostrar slider na janela de mensagem instant但nea"
 
 #: plugins/win32/transparency/win2ktrans.c:555
-#, fuzzy
 msgid "Remove IM window transparency on focus"
-msgstr "Transpar棚ncia da janela de _mensagem instant但nea"
+msgstr ""
+"Remover transpar棚ncia da janela de mensagem instant但nea ao receber foco"
 
 #: plugins/win32/transparency/win2ktrans.c:558
 #: plugins/win32/transparency/win2ktrans.c:606
-#, fuzzy
 msgid "Always on top"
-msgstr "Sempre"
+msgstr "Sempre no topo"
 
 #. Buddy List trans options
 #: plugins/win32/transparency/win2ktrans.c:590
@@ -1211,9 +1252,8 @@
 msgstr "Transpar棚ncia da janela da _lista de amigos"
 
 #: plugins/win32/transparency/win2ktrans.c:604
-#, fuzzy
 msgid "Remove Buddy List window transparency on focus"
-msgstr "Transpar棚ncia da janela da _lista de amigos"
+msgstr "Remover transnspar棚ncia da janela da lista de amigos ao receber foco"
 
 #. *< type
 #. *< ui_requirement
@@ -1234,7 +1274,6 @@
 
 #. *  description
 #: plugins/win32/transparency/win2ktrans.c:662
-#, fuzzy
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -1244,7 +1283,7 @@
 "Este plugin ativa a transpar棚ncia vari叩vel nas janelas de conversa e na "
 "lista de amigos.\n"
 "\n"
-"* Nota: Este plugin requer Win2000 ou WinXP."
+"* Nota: Este plugin requer Win2000 ou superior."
 
 #: plugins/win32/winprefs/winprefs.c:385
 msgid "GTK+ Runtime Version"
@@ -1260,7 +1299,7 @@
 msgstr "_Iniciar o Gaim junto com o Windows"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:405 src/gtkblist.c:3173
+#: plugins/win32/winprefs/winprefs.c:405 src/gtkblist.c:3419
 msgid "Buddy List"
 msgstr "Lista de amigos"
 
@@ -1273,11 +1312,12 @@
 msgid "_Keep Buddy List window on top:"
 msgstr "_Manter a janela da lista de amigos no topo:"
 
-#: plugins/win32/winprefs/winprefs.c:412 src/gtkprefs.c:1657
+#: plugins/win32/winprefs/winprefs.c:412 src/gtkprefs.c:809
+#: src/gtkprefs.c:1673
 msgid "Never"
 msgstr "Nunca"
 
-#: plugins/win32/winprefs/winprefs.c:413
+#: plugins/win32/winprefs/winprefs.c:413 src/gtkprefs.c:811
 msgid "Always"
 msgstr "Sempre"
 
@@ -1287,8 +1327,8 @@
 msgstr "Apenas quando ancorada"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:419 src/gtkprefs.c:803
-#: src/gtkprefs.c:1727
+#: plugins/win32/winprefs/winprefs.c:419 src/gtkprefs.c:805
+#: src/gtkprefs.c:1746
 msgid "Conversations"
 msgstr "Conversas"
 
@@ -1316,127 +1356,133 @@
 msgid "accounts"
 msgstr "Contas"
 
-#: src/account.c:915
+#: src/account.c:923
 msgid "Password is required to sign on."
 msgstr "� necess叩rio uma senha para logar"
 
-#: src/account.c:940
+#: src/account.c:948
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Digite a senha para %s (%s)"
 
-#: src/account.c:947
+#: src/account.c:955
 msgid "Enter Password"
 msgstr "Digite senha"
 
-#: src/account.c:952
+#: src/account.c:960
 msgid "Save password"
 msgstr "Salvar senha"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:960 src/account.c:1116 src/gtkdialogs.c:507
-#: src/gtkdialogs.c:648 src/gtkdialogs.c:704 src/gtkrequest.c:261
-#: src/protocols/gg/gg.c:434 src/protocols/gg/gg.c:581
-#: src/protocols/gg/gg.c:1498 src/protocols/jabber/jabber.c:1162
+#: src/account.c:968 src/account.c:1123 src/gtkdialogs.c:526
+#: src/gtkdialogs.c:663 src/gtkdialogs.c:719 src/gtkrequest.c:261
+#: src/protocols/gg/gg.c:463 src/protocols/gg/gg.c:600
+#: src/protocols/gg/gg.c:737 src/protocols/jabber/jabber.c:1162
 #: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:250
 #: src/protocols/msn/msn.c:265 src/protocols/msn/msn.c:280
-#: src/protocols/msn/msn.c:295 src/protocols/oscar/oscar.c:2894
-#: src/protocols/oscar/oscar.c:4404 src/protocols/oscar/oscar.c:4485
-#: src/protocols/oscar/oscar.c:7857 src/protocols/oscar/oscar.c:7982
-#: src/protocols/oscar/oscar.c:8007 src/protocols/oscar/oscar.c:8059
-#: src/protocols/sametime/sametime.c:4585 src/protocols/silc/buddy.c:465
-#: src/protocols/silc/buddy.c:1137 src/protocols/silc/chat.c:422
-#: src/protocols/silc/chat.c:460 src/protocols/silc/chat.c:723
-#: src/protocols/silc/ops.c:1083 src/protocols/silc/ops.c:1696
-#: src/protocols/silc/silc.c:716 src/protocols/yahoo/yahoo.c:2965
-#: src/protocols/yahoo/yahoo.c:2974 src/request.h:1331
+#: src/protocols/msn/msn.c:295 src/protocols/oscar/oscar.c:2895
+#: src/protocols/oscar/oscar.c:4397 src/protocols/oscar/oscar.c:4478
+#: src/protocols/oscar/oscar.c:7828 src/protocols/oscar/oscar.c:7953
+#: src/protocols/oscar/oscar.c:7978 src/protocols/oscar/oscar.c:8030
+#: src/protocols/sametime/sametime.c:5245 src/protocols/silc/buddy.c:466
+#: src/protocols/silc/buddy.c:1138 src/protocols/silc/chat.c:423
+#: src/protocols/silc/chat.c:461 src/protocols/silc/chat.c:724
+#: src/protocols/silc/ops.c:1116 src/protocols/silc/ops.c:1729
+#: src/protocols/silc/silc.c:717 src/protocols/yahoo/yahoo.c:2981
+#: src/protocols/yahoo/yahoo.c:2990 src/request.h:1331
 msgid "OK"
 msgstr "OK"
 
-#: src/account.c:961 src/account.c:1117 src/account.c:1155
-#: src/gtkaccount.c:2124 src/gtkaccount.c:2575 src/gtkblist.c:4497
-#: src/gtkdialogs.c:508 src/gtkdialogs.c:649 src/gtkdialogs.c:705
-#: src/gtkdialogs.c:724 src/gtkdialogs.c:746 src/gtkdialogs.c:766
-#: src/gtkdialogs.c:810 src/gtkdialogs.c:872 src/gtkdialogs.c:914
-#: src/gtkdialogs.c:956 src/gtkimhtmltoolbar.c:419 src/gtkprivacy.c:595
+#: src/account.c:969 src/account.c:1124 src/account.c:1162
+#: src/gtkaccount.c:2142 src/gtkaccount.c:2587 src/gtkblist.c:4761
+#: src/gtkdialogs.c:527 src/gtkdialogs.c:664 src/gtkdialogs.c:720
+#: src/gtkdialogs.c:739 src/gtkdialogs.c:761 src/gtkdialogs.c:781
+#: src/gtkdialogs.c:825 src/gtkdialogs.c:887 src/gtkdialogs.c:929
+#: src/gtkdialogs.c:971 src/gtkimhtmltoolbar.c:419 src/gtkprivacy.c:595
 #: src/gtkprivacy.c:608 src/gtkprivacy.c:633 src/gtkprivacy.c:644
-#: src/gtkrequest.c:262 src/gtksavedstatuses.c:221 src/protocols/gg/gg.c:435
-#: src/protocols/gg/gg.c:582 src/protocols/gg/gg.c:656
-#: src/protocols/gg/gg.c:1499 src/protocols/jabber/buddy.c:573
+#: src/gtkrequest.c:262 src/gtksavedstatuses.c:299 src/protocols/gg/gg.c:464
+#: src/protocols/gg/gg.c:601 src/protocols/gg/gg.c:738
+#: src/protocols/gg/gg.c:827 src/protocols/jabber/buddy.c:573
 #: src/protocols/jabber/buddy.c:1358 src/protocols/jabber/buddy.c:1392
 #: src/protocols/jabber/chat.c:780 src/protocols/jabber/jabber.c:707
 #: src/protocols/jabber/jabber.c:1163 src/protocols/jabber/xdata.c:338
 #: src/protocols/msn/msn.c:251 src/protocols/msn/msn.c:266
 #: src/protocols/msn/msn.c:281 src/protocols/msn/msn.c:296
-#: src/protocols/msn/msn.c:313 src/protocols/oscar/oscar.c:1596
-#: src/protocols/oscar/oscar.c:2895 src/protocols/oscar/oscar.c:4362
-#: src/protocols/oscar/oscar.c:4405 src/protocols/oscar/oscar.c:4442
-#: src/protocols/oscar/oscar.c:4486 src/protocols/oscar/oscar.c:7858
-#: src/protocols/oscar/oscar.c:7983 src/protocols/oscar/oscar.c:8008
-#: src/protocols/oscar/oscar.c:8060 src/protocols/oscar/oscar.c:8129
-#: src/protocols/sametime/sametime.c:4586 src/protocols/silc/buddy.c:466
-#: src/protocols/silc/buddy.c:1042 src/protocols/silc/buddy.c:1138
-#: src/protocols/silc/chat.c:595 src/protocols/silc/chat.c:724
-#: src/protocols/silc/ops.c:1697 src/protocols/silc/silc.c:717
-#: src/protocols/yahoo/yahoo.c:2966 src/protocols/yahoo/yahoo.c:2975
+#: src/protocols/msn/msn.c:313 src/protocols/oscar/oscar.c:1597
+#: src/protocols/oscar/oscar.c:2896 src/protocols/oscar/oscar.c:4355
+#: src/protocols/oscar/oscar.c:4398 src/protocols/oscar/oscar.c:4435
+#: src/protocols/oscar/oscar.c:4479 src/protocols/oscar/oscar.c:7829
+#: src/protocols/oscar/oscar.c:7954 src/protocols/oscar/oscar.c:7979
+#: src/protocols/oscar/oscar.c:8031 src/protocols/oscar/oscar.c:8100
+#: src/protocols/sametime/sametime.c:3382
+#: src/protocols/sametime/sametime.c:3465
+#: src/protocols/sametime/sametime.c:3592
+#: src/protocols/sametime/sametime.c:4367
+#: src/protocols/sametime/sametime.c:5246
+#: src/protocols/sametime/sametime.c:5462
+#: src/protocols/sametime/sametime.c:5548 src/protocols/silc/buddy.c:467
+#: src/protocols/silc/buddy.c:1043 src/protocols/silc/buddy.c:1139
+#: src/protocols/silc/chat.c:596 src/protocols/silc/chat.c:725
+#: src/protocols/silc/ops.c:1730 src/protocols/silc/silc.c:718
+#: src/protocols/yahoo/yahoo.c:2982 src/protocols/yahoo/yahoo.c:2991
 #: src/request.h:1331 src/request.h:1341
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/account.c:986 src/connection.c:96
+#: src/account.c:994 src/connection.c:96
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Plugin de protocolo faltando para %s"
 
-#: src/account.c:988 src/connection.c:99
+#: src/account.c:996 src/connection.c:99
 msgid "Connection Error"
 msgstr "Erro de conex達o"
 
-#: src/account.c:1052 src/protocols/gg/gg.c:470
+#: src/account.c:1060 src/protocols/gg/gg.c:641
 #: src/protocols/jabber/jabber.c:1115
 msgid "New passwords do not match."
 msgstr "Senhas novas n達o conferem."
 
-#: src/account.c:1061
+#: src/account.c:1069
 msgid "Fill out all fields completely."
 msgstr "Preencha todos os campos completamente."
 
-#: src/account.c:1085
-msgid "Original password"
-msgstr "Senha original"
-
 #: src/account.c:1092
-msgid "New password"
-msgstr "Nova senha"
+msgid "Original password"
+msgstr "Senha original"
 
 #: src/account.c:1099
+msgid "New password"
+msgstr "Nova senha"
+
+#: src/account.c:1106
 msgid "New password (again)"
 msgstr "Nova senha (novamente)"
 
-#: src/account.c:1105
+#: src/account.c:1112
 #, c-format
 msgid "Change password for %s"
 msgstr "Mudar senha para %s"
 
-#: src/account.c:1113
+#: src/account.c:1120
 msgid "Please enter your current password and your new password."
 msgstr "Favor digitar sua senha atual e sua nova senha."
 
-#: src/account.c:1146
+#: src/account.c:1153
 #, c-format
 msgid "Change user information for %s"
 msgstr "Modificar informa巽探es do usu叩rio para %s"
 
-#: src/account.c:1154 src/gtkdebug.c:684 src/gtkrequest.c:268
+#: src/account.c:1161 src/gtkdebug.c:684 src/gtkrequest.c:268
 #: src/protocols/jabber/buddy.c:572
 msgid "Save"
 msgstr "Salvar"
 
-#: src/account.c:1641 src/gtkft.c:156 src/protocols/jabber/buddy.c:633
+#: src/account.c:1656 src/gtkft.c:157 src/protocols/jabber/buddy.c:633
 #: src/protocols/jabber/buddy.c:1083 src/protocols/jabber/buddy.c:1100
-#: src/protocols/novell/novell.c:2837
+#: src/protocols/novell/novell.c:2842
 msgid "Unknown"
 msgstr "Desconhecido"
 
@@ -1444,12 +1490,12 @@
 msgid "buddy list"
 msgstr "Lista de amigos"
 
-#: src/blist.c:1162
+#: src/blist.c:1146
 msgid "Chats"
 msgstr "Bate-papos"
 
-#: src/blist.c:1863
-#, fuzzy, c-format
+#: src/blist.c:1845
+#, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
 "in.  This buddy and the group were not removed.\n"
@@ -1459,15 +1505,11 @@
 msgstr[0] ""
 "%d amigo do grupo %s n達o foi removido porque sua conta n達o estava conectada. "
 "Este amigo e o grupo n達o foram removidos.\n"
+msgstr[1] ""
 "%d amigos do grupo %s n達o foram removidos porque suas contas n達o estavam "
 "conectadas. Estes amigos e o grupo n達o foram removidos.\n"
-msgstr[1] ""
-"%d amigo do grupo %s n達o foi removido porque sua conta n達o estava conectada. "
-"Este amigo e o grupo n達o foram removidos.\n"
-"%d amigos do grupo %s n達o foram removidos porque suas contas n達o estavam "
-"conectadas. Estes amigos e o grupo n達o foram removidos.\n"
-
-#: src/blist.c:1872
+
+#: src/blist.c:1854
 msgid "Group not removed"
 msgstr "Grupo n達o removido"
 
@@ -1475,63 +1517,77 @@
 msgid "Registration Error"
 msgstr "Erro ao registrar"
 
-#: src/conversation.c:205
+#: src/connection.c:280
+#, c-format
+msgid "+++ %s signed on"
+msgstr "+++ %s conectou"
+
+#: src/connection.c:323
+#, c-format
+msgid "+++ %s signed off"
+msgstr "+++ %s desconectou"
+
+#: src/conversation.c:213
 msgid "Unable to send message: The message is too large."
 msgstr "Imposs鱈vel enviar mensagem: A mensagem 辿 muito extensa."
 
-#: src/conversation.c:208 src/conversation.c:221
+#: src/conversation.c:216 src/conversation.c:229
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "Imposs鱈vel enviar mensagem para %s."
 
-#: src/conversation.c:209
+#: src/conversation.c:217
 msgid "The message is too large."
 msgstr "A mensagem 辿 muito extensa."
 
-#: src/conversation.c:218
+#: src/conversation.c:226
 msgid "Unable to send message."
 msgstr "Imposs鱈vel enviar mensagem."
 
-#: src/conversation.c:1497
+#: src/conversation.c:1520
 #, c-format
 msgid "%s entered the room."
 msgstr "%s entrou na sala."
 
-#: src/conversation.c:1499
+#: src/conversation.c:1522
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] entrou na sala."
 
-#: src/conversation.c:1598
+#: src/conversation.c:1625
 #, c-format
 msgid "You are now known as %s"
 msgstr "Voc棚 mudou seu apelido para %s"
 
-#: src/conversation.c:1613
+#: src/conversation.c:1640
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s mudou seu apelido para %s"
 
-#: src/conversation.c:1669
+#: src/conversation.c:1696
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s saiu da sala (%s)."
 
-#: src/conversation.c:1671
+#: src/conversation.c:1698
 #, c-format
 msgid "%s left the room."
 msgstr "%s saiu da sala."
 
-#: src/conversation.c:1748
+#: src/conversation.c:1775
 #, c-format
 msgid "(+%d more)"
 msgstr "(+%d mais)"
 
-#: src/conversation.c:1750
+#: src/conversation.c:1777
 #, c-format
 msgid " left the room (%s)."
 msgstr " saiu da sala (%s)."
 
+#: src/desktopitem.c:286 src/desktopitem.c:875
+msgid "No name"
+msgstr "Sem nome"
+
 #: src/ft.c:188 src/protocols/msn/msn.c:412
 #, c-format
 msgid ""
@@ -1603,60 +1659,60 @@
 msgid "%s is offering to send file %s"
 msgstr "Oferecendo para %s o arquivo %s"
 
-#: src/ft.c:422
+#: src/ft.c:426
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s n達o 辿 um nome de arquivo v叩lido.\n"
 
-#: src/ft.c:443
+#: src/ft.c:447
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Oferecendo o envio de %s para %s"
 
-#: src/ft.c:454
+#: src/ft.c:458
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "Aceitar pedido de transfer棚ncia de %s de %s?"
 
-#: src/ft.c:608
+#: src/ft.c:612
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Transfer棚ncia de %s conclu鱈da"
 
-#: src/ft.c:611
+#: src/ft.c:615
 msgid "File transfer complete"
 msgstr "Transfer棚ncia de arquivo conclu鱈da"
 
-#: src/ft.c:995
+#: src/ft.c:999
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Voc棚 cancelou a transfer棚ncia de %s"
 
-#: src/ft.c:1000
+#: src/ft.c:1004
 msgid "File transfer cancelled"
 msgstr "Transfer棚ncia de arquivo cancelada"
 
-#: src/ft.c:1057
+#: src/ft.c:1061
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s cancelou a transfer棚ncia de %s"
 
-#: src/ft.c:1062
+#: src/ft.c:1066
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s cancelou a transfer棚ncia do arquivo"
 
-#: src/ft.c:1119
+#: src/ft.c:1123
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Transfer棚ncia de arquivo para %s falhou"
 
-#: src/ft.c:1121
+#: src/ft.c:1125
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Transfer棚ncia de arquivo de %s falhou"
 
-#: src/gtkaccount.c:362
+#: src/gtkaccount.c:359
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1668,152 +1724,146 @@
 "<b>Dimens探es da imagem:</b> %dx%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:730
+#: src/gtkaccount.c:727
 msgid "Login Options"
 msgstr "Op巽探es de conex達o"
 
-#: src/gtkaccount.c:747 src/gtkft.c:623
+#: src/gtkaccount.c:744 src/gtkft.c:625
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: src/gtkaccount.c:752 src/gtkblist.c:4051
+#: src/gtkaccount.c:749 src/gtkblist.c:4312
 msgid "Screen Name:"
 msgstr "Nome do usu叩rio:"
 
-#: src/gtkaccount.c:825
+#: src/gtkaccount.c:823
 msgid "Password:"
 msgstr "Senha:"
 
-#: src/gtkaccount.c:830 src/gtkblist.c:4065 src/gtkblist.c:4444
+#: src/gtkaccount.c:828 src/gtkblist.c:4326 src/gtkblist.c:4708
 msgid "Alias:"
 msgstr "Apelido:"
 
-#: src/gtkaccount.c:834
+#: src/gtkaccount.c:832
 msgid "Remember password"
 msgstr "Lembrar senha"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:879
+#: src/gtkaccount.c:877
 msgid "User Options"
 msgstr "Op巽探es do usu叩rio"
 
-#: src/gtkaccount.c:892
+#: src/gtkaccount.c:890
 msgid "New mail notifications"
 msgstr "Novas notifica巽探es de email"
 
-#: src/gtkaccount.c:901
+#: src/gtkaccount.c:899
 msgid "Buddy icon:"
 msgstr "�cone do amigo:"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:990
+#: src/gtkaccount.c:996
 #, c-format
 msgid "%s Options"
 msgstr "Op巽探es de %s"
 
-#. Use Global Proxy Settings
-#: src/gtkaccount.c:1128 src/gtkaccount.c:1175
+#: src/gtkaccount.c:1202
 msgid "Use Global Proxy Settings"
 msgstr "Usar configura巽達o global de proxy"
 
-#. No Proxy
-#: src/gtkaccount.c:1134 src/gtkaccount.c:1182
+#: src/gtkaccount.c:1208
 msgid "No Proxy"
 msgstr "Nenhum proxy"
 
-#. HTTP
-#: src/gtkaccount.c:1140 src/gtkaccount.c:1189
+#: src/gtkaccount.c:1214
 msgid "HTTP"
 msgstr "HTTP"
 
-#. SOCKS 4
-#: src/gtkaccount.c:1146 src/gtkaccount.c:1196
+#: src/gtkaccount.c:1220
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#. SOCKS 5
-#: src/gtkaccount.c:1152 src/gtkaccount.c:1203
+#: src/gtkaccount.c:1226
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#. Use Environmental Settings
-#: src/gtkaccount.c:1158 src/gtkaccount.c:1210 src/gtkprefs.c:1007
+#: src/gtkaccount.c:1232 src/gtkprefs.c:1023
 msgid "Use Environmental Settings"
 msgstr "Usar configura巽探es do ambiente"
 
-#: src/gtkaccount.c:1249
+#: src/gtkaccount.c:1266
 msgid "you can see the butterflies mating"
 msgstr "voc棚 pode ver as borboletas acasalando-se"
 
-#: src/gtkaccount.c:1253
+#: src/gtkaccount.c:1270
 msgid "If you look real closely"
 msgstr "Se voc棚 olhar bem de perto"
 
-#: src/gtkaccount.c:1269
+#: src/gtkaccount.c:1286
 msgid "Proxy Options"
 msgstr "Op巽探es de proxy"
 
-#: src/gtkaccount.c:1287 src/gtkprefs.c:1001
+#: src/gtkaccount.c:1300 src/gtkprefs.c:1017
 msgid "Proxy _type:"
 msgstr "_Tipo de proxy:"
 
-#: src/gtkaccount.c:1296 src/gtkprefs.c:1022
+#: src/gtkaccount.c:1309 src/gtkprefs.c:1038
 msgid "_Host:"
 msgstr "_Host:"
 
-#: src/gtkaccount.c:1300 src/gtkprefs.c:1040
+#: src/gtkaccount.c:1313 src/gtkprefs.c:1056
 msgid "_Port:"
 msgstr "_Porta:"
 
-#: src/gtkaccount.c:1308
+#: src/gtkaccount.c:1321
 msgid "_Username:"
 msgstr "_Nome de usu叩rio:"
 
-#: src/gtkaccount.c:1313 src/gtkprefs.c:1077
+#: src/gtkaccount.c:1327 src/gtkprefs.c:1093
 msgid "Pa_ssword:"
 msgstr "_Senha:"
 
-#: src/gtkaccount.c:1700
+#: src/gtkaccount.c:1703
 msgid "Add Account"
 msgstr "Adicionar conta"
 
-#: src/gtkaccount.c:1702
+#: src/gtkaccount.c:1705
 msgid "Modify Account"
 msgstr "Modificar conta"
 
 #. Register button
-#: src/gtkaccount.c:1750 src/protocols/jabber/jabber.c:706
+#: src/gtkaccount.c:1753 src/protocols/jabber/jabber.c:706
 msgid "Register"
 msgstr "Registrar"
 
-#: src/gtkaccount.c:2118 src/gtksavedstatuses.c:217
+#: src/gtkaccount.c:2136 src/gtksavedstatuses.c:295
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Voc棚 tem certeza de que deseja remover %s?"
 
-#: src/gtkaccount.c:2123 src/gtkrequest.c:265 src/gtksavedstatuses.c:220
+#: src/gtkaccount.c:2141 src/gtkrequest.c:265 src/gtksavedstatuses.c:298
 msgid "Delete"
 msgstr "Remover"
 
-#: src/gtkaccount.c:2187 src/gtksavedstatuses.c:686
-#: src/protocols/oscar/oscar.c:5049
+#: src/gtkaccount.c:2199 src/gtksavedstatuses.c:856
+#: src/protocols/oscar/oscar.c:5042
 msgid "Screen Name"
 msgstr "Nome de usu叩rio"
 
-#: src/gtkaccount.c:2210
+#: src/gtkaccount.c:2222 src/gtkplugin.c:378
 msgid "Enabled"
 msgstr "Ativado"
 
-#: src/gtkaccount.c:2218
+#: src/gtkaccount.c:2230
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: src/gtkaccount.c:2550
+#: src/gtkaccount.c:2562
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s fez %s seu amigo%s%s%s"
 
-#: src/gtkaccount.c:2564
+#: src/gtkaccount.c:2576
 msgid ""
 "\n"
 "\n"
@@ -1823,21 +1873,22 @@
 "\n"
 "Voc棚 deseja adicionar ele(a) � sua lista de amigos?"
 
-#: src/gtkaccount.c:2572
+#: src/gtkaccount.c:2584
 msgid "Add buddy to your list?"
 msgstr "Adicionar amigo � sua lista?"
 
-#: src/gtkaccount.c:2574 src/gtkblist.c:4496 src/gtkconv.c:1527
-#: src/gtkrequest.c:266 src/protocols/gg/gg.c:655
-#: src/protocols/oscar/oscar.c:4674 src/protocols/silc/chat.c:594
+#: src/gtkaccount.c:2586 src/gtkblist.c:4760 src/gtkconv.c:1534
+#: src/gtkrequest.c:266 src/protocols/gg/gg.c:826
+#: src/protocols/oscar/oscar.c:4667 src/protocols/sametime/sametime.c:5547
+#: src/protocols/silc/chat.c:595
 msgid "Add"
 msgstr "Adicionar"
 
-#: src/gtkblist.c:595
+#: src/gtkblist.c:621
 msgid "Join a Chat"
 msgstr "Entrar em um bate-papo"
 
-#: src/gtkblist.c:616
+#: src/gtkblist.c:642
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -1845,219 +1896,220 @@
 "Por favor digite as informa巽探es apropriadas sobre o bate-papo em que voc棚 "
 "gostaria de entrar.\n"
 
-#: src/gtkblist.c:627 src/gtkpounce.c:415 src/gtkroomlist.c:354
+#: src/gtkblist.c:653 src/gtkpounce.c:415 src/gtkroomlist.c:354
 msgid "_Account:"
 msgstr "_Conta:"
 
-#: src/gtkblist.c:935
+#: src/gtkblist.c:961
 msgid "Get _Info"
 msgstr "Ver _info"
 
-#: src/gtkblist.c:938
+#: src/gtkblist.c:964
 msgid "I_M"
 msgstr "_MI"
 
-#: src/gtkblist.c:944
+#: src/gtkblist.c:970
 msgid "_Send File"
 msgstr "_Enviar arquivo"
 
-#: src/gtkblist.c:950
+#: src/gtkblist.c:978
+msgid "Start _Voice Chat"
+msgstr "Iniciar bate-papo com _voz"
+
+#: src/gtkblist.c:984
 msgid "Add Buddy _Pounce"
 msgstr "Adicionar notifica巽達o de _amigo"
 
-#: src/gtkblist.c:954 src/gtkblist.c:958 src/gtkblist.c:1056
-#: src/gtkblist.c:1079
+#: src/gtkblist.c:988 src/gtkblist.c:992 src/gtkblist.c:1092
+#: src/gtkblist.c:1115
 msgid "View _Log"
 msgstr "Ver _log"
 
-#: src/gtkblist.c:969
+#: src/gtkblist.c:1003
 msgid "_Alias Buddy..."
 msgstr "_Apelidar amigo..."
 
-#: src/gtkblist.c:971
+#: src/gtkblist.c:1005
 msgid "_Remove Buddy"
 msgstr "_Remover amigo"
 
-#: src/gtkblist.c:973
+#: src/gtkblist.c:1007
 msgid "Alias Contact..."
 msgstr "Apelidar contato..."
 
-#: src/gtkblist.c:976 src/gtkdialogs.c:808 src/gtkdialogs.c:809
+#: src/gtkblist.c:1010 src/gtkdialogs.c:823 src/gtkdialogs.c:824
 msgid "Remove Contact"
 msgstr "Remover contato"
 
-#: src/gtkblist.c:980 src/gtkblist.c:1064 src/gtkblist.c:1085
+#: src/gtkblist.c:1014 src/gtkblist.c:1100 src/gtkblist.c:1121
 msgid "_Alias..."
 msgstr "_Apelido..."
 
-#: src/gtkblist.c:982 src/gtkblist.c:1066 src/gtkblist.c:1087
+#: src/gtkblist.c:1016 src/gtkblist.c:1102 src/gtkblist.c:1123
 msgid "_Remove"
 msgstr "_Remover"
 
-#: src/gtkblist.c:1028
+#: src/gtkblist.c:1063
 msgid "Add a _Buddy"
 msgstr "Adicionar um _amigo"
 
-#: src/gtkblist.c:1030
+#: src/gtkblist.c:1065
 msgid "Add a C_hat"
 msgstr "Adicionar um c_hat"
 
-#: src/gtkblist.c:1032
+#: src/gtkblist.c:1068
 msgid "_Delete Group"
 msgstr "_Remover grupo"
 
-#: src/gtkblist.c:1034
+#: src/gtkblist.c:1070
 msgid "_Rename"
 msgstr "_Renomear"
 
 #. join button
-#: src/gtkblist.c:1052 src/gtkroomlist.c:264 src/gtkroomlist.c:409
-#: src/gtkstock.c:118
+#: src/gtkblist.c:1088 src/gtkroomlist.c:264 src/gtkroomlist.c:409
+#: src/gtkstock.c:120
 msgid "_Join"
 msgstr "_Entrar"
 
-#: src/gtkblist.c:1054
+#: src/gtkblist.c:1090
 msgid "Auto-Join"
 msgstr "Entrar automaticamente"
 
-#: src/gtkblist.c:1092 src/gtkblist.c:1115
+#: src/gtkblist.c:1128 src/gtkblist.c:1151
 msgid "_Collapse"
 msgstr "Re_colher"
 
-#: src/gtkblist.c:1120
+#: src/gtkblist.c:1156
 msgid "_Expand"
 msgstr "_Expandir"
 
-#: src/gtkblist.c:1353 src/gtkblist.c:1363 src/gtkblist.c:3326
-#: src/gtkblist.c:3331
+#: src/gtkblist.c:1389 src/gtkblist.c:1399 src/gtkblist.c:3588
+#: src/gtkblist.c:3593
 msgid "/Tools/Mute Sounds"
 msgstr "/Ferramentas/N達o tocar sons"
 
-#: src/gtkblist.c:1822 src/gtkconv.c:3745 src/gtkpounce.c:314
+#: src/gtkblist.c:1858 src/gtkconv.c:3801 src/gtkpounce.c:314
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
 "Voc棚 n達o est叩 conectado com uma conta que permita adicionar este amigo."
 
 #. Buddies menu
-#: src/gtkblist.c:2329
+#: src/gtkblist.c:2422
 msgid "/_Buddies"
 msgstr "/_Amigos"
 
-#: src/gtkblist.c:2330
+#: src/gtkblist.c:2423
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Amigos/Nova _mensagem instant但nea..."
 
-#: src/gtkblist.c:2331
+#: src/gtkblist.c:2424
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Amigos/Entrar em um _bate-papo..."
 
-#: src/gtkblist.c:2332
+#: src/gtkblist.c:2425
 msgid "/Buddies/Get User _Info..."
 msgstr "/Amigos/Ver _informa巽探es do usu叩rio..."
 
-#: src/gtkblist.c:2333
+#: src/gtkblist.c:2426
 msgid "/Buddies/View User _Log..."
 msgstr "/Amigos/Ver _log do usu叩rio..."
 
-#: src/gtkblist.c:2335
+#: src/gtkblist.c:2428
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Amigos/Exibir amig_os desconectados"
 
-#: src/gtkblist.c:2336
+#: src/gtkblist.c:2429
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Amigos/Exibir grupos _vazios"
 
-#: src/gtkblist.c:2337
-#, fuzzy
+#: src/gtkblist.c:2430
 msgid "/Buddies/Show Buddy _Details"
-msgstr "/Amigos/Exibir amigos desconectados"
-
-#: src/gtkblist.c:2338 src/gtkblist.c:5158
-#, fuzzy
+msgstr "/Amigos/Exibir _detalhes do amigo"
+
+#: src/gtkblist.c:2431 src/gtkblist.c:5461
 msgid "/Buddies/Sort Buddies"
-msgstr "/Amigos/Exibir amigos desconectados"
-
-#: src/gtkblist.c:2340
+msgstr "/Amigos/Ordenar amigos"
+
+#: src/gtkblist.c:2433
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Amigos/_Adicionar amigo..."
 
-#: src/gtkblist.c:2341
+#: src/gtkblist.c:2434
 msgid "/Buddies/Add C_hat..."
 msgstr "/Amigos/Adicionar bate-_papo..."
 
-#: src/gtkblist.c:2342
+#: src/gtkblist.c:2435
 msgid "/Buddies/Add _Group..."
 msgstr "/Amigos/Adicionar _grupo..."
 
-#: src/gtkblist.c:2344
+#: src/gtkblist.c:2437
 msgid "/Buddies/_Quit"
 msgstr "/Amigos/_Sair"
 
 #. Tools
-#: src/gtkblist.c:2347
+#: src/gtkblist.c:2440
 msgid "/_Tools"
 msgstr "/_Ferramentas"
 
-#: src/gtkblist.c:2348
+#: src/gtkblist.c:2441
 msgid "/Tools/Buddy _Pounce"
 msgstr "/Ferramentas/Notifica巽達o de amigo"
 
-#: src/gtkblist.c:2349
+#: src/gtkblist.c:2442
 msgid "/Tools/Account Ac_tions"
 msgstr "/Ferramentas/A巽探es de con_tas"
 
-#: src/gtkblist.c:2351
+#: src/gtkblist.c:2444
 msgid "/Tools/A_ccounts"
 msgstr "/Ferramentas/_Contas"
 
-#: src/gtkblist.c:2352
+#: src/gtkblist.c:2445
 msgid "/Tools/Pr_eferences"
 msgstr "/Ferramentas/Pr_efer棚ncias"
 
-#: src/gtkblist.c:2353
-#, fuzzy
+#: src/gtkblist.c:2446
 msgid "/Tools/Plu_gins"
-msgstr "/Ferramentas/A巽探es de plugins"
-
-#: src/gtkblist.c:2354
+msgstr "/Ferramentas/Plu_gins"
+
+#: src/gtkblist.c:2447
 msgid "/Tools/Pr_ivacy"
 msgstr "/Ferramentas/Pr_ivacidade"
 
-#: src/gtkblist.c:2355
+#: src/gtkblist.c:2448
 msgid "/Tools/_File Transfers"
 msgstr "/Ferramentas/Transfer棚ncias de arquivo"
 
-#: src/gtkblist.c:2356
+#: src/gtkblist.c:2449
 msgid "/Tools/R_oom List"
 msgstr "/Ferramentas/_Lista de salas"
 
-#: src/gtkblist.c:2358
+#: src/gtkblist.c:2451
 msgid "/Tools/Mute _Sounds"
 msgstr "/Ferramentas/N達o tocar _sons"
 
-#: src/gtkblist.c:2359
+#: src/gtkblist.c:2452
 msgid "/Tools/View System _Log"
 msgstr "/Ferramentas/Ver log do _sistema"
 
 #. Help
-#: src/gtkblist.c:2362
+#: src/gtkblist.c:2455
 msgid "/_Help"
 msgstr "/_Ajuda"
 
-#: src/gtkblist.c:2363
+#: src/gtkblist.c:2456
 msgid "/Help/Online _Help"
 msgstr "/Ajuda/_Ajuda online"
 
-#: src/gtkblist.c:2364
+#: src/gtkblist.c:2457
 msgid "/Help/_Debug Window"
 msgstr "/Ajuda/Janela de _debug"
 
-#: src/gtkblist.c:2365
+#: src/gtkblist.c:2458
 msgid "/Help/_About"
 msgstr "/Ajuda/_Sobre"
 
-#: src/gtkblist.c:2397 src/gtkblist.c:2464
+#: src/gtkblist.c:2490 src/gtkblist.c:2557
 #, c-format
 msgid ""
 "\n"
@@ -2066,7 +2118,7 @@
 "\n"
 "<b>Conta:</b> %s"
 
-#: src/gtkblist.c:2473
+#: src/gtkblist.c:2566
 #, c-format
 msgid ""
 "\n"
@@ -2075,7 +2127,7 @@
 "\n"
 "<b>Apelido do contato:</b> %s"
 
-#: src/gtkblist.c:2481
+#: src/gtkblist.c:2574
 #, c-format
 msgid ""
 "\n"
@@ -2084,7 +2136,7 @@
 "\n"
 "<b>Apelido (local):</b> %s"
 
-#: src/gtkblist.c:2489
+#: src/gtkblist.c:2582
 #, c-format
 msgid ""
 "\n"
@@ -2093,7 +2145,7 @@
 "\n"
 "<b>Apelido (remoto):</b> %s"
 
-#: src/gtkblist.c:2498
+#: src/gtkblist.c:2591
 #, c-format
 msgid ""
 "\n"
@@ -2102,7 +2154,7 @@
 "\n"
 "<b>Conectado por:</b> %s"
 
-#: src/gtkblist.c:2510
+#: src/gtkblist.c:2603
 #, c-format
 msgid ""
 "\n"
@@ -2111,7 +2163,7 @@
 "\n"
 "<b>Inativo por:</b> %s"
 
-#: src/gtkblist.c:2546
+#: src/gtkblist.c:2638
 #, c-format
 msgid ""
 "\n"
@@ -2120,7 +2172,7 @@
 "\n"
 "<b>Visto pela 炭ltima vez:</b> %s"
 
-#: src/gtkblist.c:2554
+#: src/gtkblist.c:2646
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2128,7 +2180,7 @@
 "\n"
 "<b>Status:</b> Desconectado"
 
-#: src/gtkblist.c:2577
+#: src/gtkblist.c:2669
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2136,7 +2188,7 @@
 "\n"
 "<b>Descri巽達o:</b> Assombroso"
 
-#: src/gtkblist.c:2579
+#: src/gtkblist.c:2671
 msgid ""
 "\n"
 "<b>Status:</b> Awesome"
@@ -2144,7 +2196,7 @@
 "\n"
 "<b>Status</b>: Incr鱈vel"
 
-#: src/gtkblist.c:2581
+#: src/gtkblist.c:2673
 msgid ""
 "\n"
 "<b>Status:</b> Rockin'"
@@ -2152,105 +2204,107 @@
 "\n"
 "<b>Status</b>: Botando pra quebrar"
 
-#: src/gtkblist.c:2843
+#: src/gtkblist.c:2939
 #, c-format
 msgid "Idle (%dh %02dm) "
 msgstr "Inativo (%dh%02dm) "
 
-#: src/gtkblist.c:2845
+#: src/gtkblist.c:2941
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Inativo (%dm) "
 
-#: src/gtkblist.c:2848
+#: src/gtkblist.c:2944
 msgid "Idle "
 msgstr "Inativo "
 
-#: src/gtkblist.c:2852
+#: src/gtkblist.c:2948
 msgid "Offline "
 msgstr "Desconectado "
 
-#: src/gtkblist.c:2968
+#: src/gtkblist.c:3064
 msgid "/Buddies/New Instant Message..."
 msgstr "/Amigos/Nova mensagem instant但nea..."
 
-#: src/gtkblist.c:2969 src/gtkblist.c:3003
+#: src/gtkblist.c:3065 src/gtkblist.c:3099
 msgid "/Buddies/Join a Chat..."
 msgstr "/Amigos/Entrar em um bate-papo..."
 
-#: src/gtkblist.c:2970
+#: src/gtkblist.c:3066
 msgid "/Buddies/Get User Info..."
 msgstr "/Amigos/Ver informa巽探es do usu叩rio..."
 
-#: src/gtkblist.c:2971
+#: src/gtkblist.c:3067
 msgid "/Buddies/Add Buddy..."
 msgstr "/Amigos/Adicionar amigo..."
 
-#: src/gtkblist.c:2972
+#: src/gtkblist.c:3068 src/gtkblist.c:3102
 msgid "/Buddies/Add Chat..."
 msgstr "/Amigos/Adicionar bate-papo..."
 
-#: src/gtkblist.c:2973
+#: src/gtkblist.c:3069
 msgid "/Buddies/Add Group..."
 msgstr "/Amigos/Adicionar grupo..."
 
-#: src/gtkblist.c:3006
+#: src/gtkblist.c:3105
 msgid "/Tools/Room List"
 msgstr "/Ferramentas/Lista de salas"
 
-#: src/gtkblist.c:3009
+#: src/gtkblist.c:3108
 msgid "/Tools/Privacy"
 msgstr "/Ferramentas/Privacidade"
 
-#: src/gtkblist.c:3085
-#, fuzzy
+#: src/gtkblist.c:3208
+#, c-format
+msgid "Unread messages from %s\n"
+msgstr "Mensagem n達o-lidas de %s\n"
+
+#: src/gtkblist.c:3285
 msgid "Manually"
-msgstr "Manual"
-
-#: src/gtkblist.c:3087
-#, fuzzy
+msgstr "Manualmente"
+
+#: src/gtkblist.c:3287
 msgid "Alphabetically"
-msgstr "Alfab辿tica"
-
-#: src/gtkblist.c:3088
+msgstr "Alfabeticamente"
+
+#: src/gtkblist.c:3288
 msgid "By status"
 msgstr "Por status"
 
-#: src/gtkblist.c:3089
+#: src/gtkblist.c:3289
 msgid "By log size"
 msgstr "Por tamanho do log"
 
-#: src/gtkblist.c:3201
+#: src/gtkblist.c:3451
 msgid "/Tools/Buddy Pounce"
 msgstr "/Ferramentas/Notifica巽達o de amigos"
 
-#: src/gtkblist.c:3202
+#: src/gtkblist.c:3452
 msgid "/Tools/Account Actions"
 msgstr "/Ferramentas/A巽探es de contas"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3322
+#: src/gtkblist.c:3584
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Amigos/Exibir amigos desconectados"
 
-#: src/gtkblist.c:3324
+#: src/gtkblist.c:3586
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Amigos/Exibir grupos vazios"
 
-#: src/gtkblist.c:3328
-#, fuzzy
+#: src/gtkblist.c:3590
 msgid "/Buddies/Show Buddy Details"
 msgstr "/Amigos/Exibir amigos desconectados"
 
-#: src/gtkblist.c:4005 src/protocols/silc/buddy.c:736
-#: src/protocols/silc/buddy.c:994 src/protocols/silc/buddy.c:1039
-#: src/protocols/silc/buddy.c:1129 src/protocols/yahoo/yahoo.c:2886
+#: src/gtkblist.c:4266 src/protocols/silc/buddy.c:737
+#: src/protocols/silc/buddy.c:995 src/protocols/silc/buddy.c:1040
+#: src/protocols/silc/buddy.c:1130 src/protocols/yahoo/yahoo.c:2902
 msgid "Add Buddy"
 msgstr "Adicionar amigo"
 
-#: src/gtkblist.c:4029
+#: src/gtkblist.c:4290
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
@@ -2262,15 +2316,15 @@
 "poss鱈vel.\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:4092 src/gtkblist.c:4424
+#: src/gtkblist.c:4353 src/gtkblist.c:4688
 msgid "Account:"
 msgstr "Conta:"
 
-#: src/gtkblist.c:4357
+#: src/gtkblist.c:4621
 msgid "This protocol does not support chat rooms."
 msgstr "Este protocolo n達o suporta salas de bate-papo."
 
-#: src/gtkblist.c:4373
+#: src/gtkblist.c:4637
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -2278,11 +2332,11 @@
 "Atualmente, voc棚 n達o est叩 conectado em nenhum protocolo que possui o recurso "
 "de bate-papo."
 
-#: src/gtkblist.c:4390
+#: src/gtkblist.c:4654
 msgid "Add Chat"
 msgstr "Adicionar bate-papo"
 
-#: src/gtkblist.c:4414
+#: src/gtkblist.c:4678
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2290,49 +2344,51 @@
 "Por favor digite um apelido, e as informa巽探es apropriadas sobre o bate-papo "
 "que voc棚 gostaria de adicionar � sua lista de amigos.\n"
 
-#: src/gtkblist.c:4493
+#: src/gtkblist.c:4757 src/protocols/sametime/sametime.c:5461
+#: src/protocols/sametime/sametime.c:5545
 msgid "Add Group"
 msgstr "Criar grupo"
 
-#: src/gtkblist.c:4494
+#: src/gtkblist.c:4758
 msgid "Please enter the name of the group to be added."
 msgstr "Por favor digite o nome do grupo a ser criado."
 
-#: src/gtkblist.c:5025
+#: src/gtkblist.c:5326
 msgid "No actions available"
 msgstr "Nenhuma a巽達o dispon鱈vel"
 
-#: src/gtkblist.c:5094
-#, fuzzy
+#: src/gtkblist.c:5395
 msgid "/Tools"
-msgstr "/_Ferramentas"
-
-#: src/gtkconn.c:190
-#, fuzzy, c-format
-msgid "%s disconnected"
-msgstr "Desconectado"
+msgstr "/Ferramentas"
 
 #: src/gtkconn.c:191
 #, c-format
+msgid "%s disconnected"
+msgstr "%s desconectou"
+
+#: src/gtkconn.c:192
+#, c-format
 msgid ""
 "%s was disconnected due to an error. %s The account has been disabled. "
 "Correct the error and reenable the account to connect."
 msgstr ""
-
-#: src/gtkconv.c:325
+"%s foi desconectado devido a um erro. %s A conta foi desativada. Corrija o "
+"erro e reative a conta para conectar."
+
+#: src/gtkconv.c:331
 #, c-format
 msgid "me is using Gaim v%s."
 msgstr "est叩 usando o Gaim v%s."
 
-#: src/gtkconv.c:334
+#: src/gtkconv.c:340
 msgid "Supported debug options are:  version"
 msgstr "As op巽探es de depura巽達o suportadas s達o:  version"
 
-#: src/gtkconv.c:371
+#: src/gtkconv.c:376
 msgid "No such command (in this context)."
 msgstr "Comando inexistente (neste contexto)."
 
-#: src/gtkconv.c:374
+#: src/gtkconv.c:379
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -2340,47 +2396,47 @@
 "Use \"/help &lt;comando&gt;\" para ajuda com um comando espec鱈fico.\n"
 "Os seguintes comandos est達o dispon鱈veis neste contexto:\n"
 
-#: src/gtkconv.c:446
+#: src/gtkconv.c:451
 msgid "No such command."
 msgstr "Comando inexistente."
 
-#: src/gtkconv.c:453
+#: src/gtkconv.c:458
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 "Erro de sintaxe:  Voc棚 digitou um n炭mero incorreto de argumentos para este "
 "comando."
 
-#: src/gtkconv.c:458
+#: src/gtkconv.c:463
 msgid "Your command failed for an unknown reason."
 msgstr "Seu comando falhou por um motivo desconhecido."
 
-#: src/gtkconv.c:465
+#: src/gtkconv.c:470
 msgid "That command only works in chats, not IMs."
 msgstr "Este comando s坦 funciona em bate-papos, n達o em conversas."
 
-#: src/gtkconv.c:468
+#: src/gtkconv.c:473
 msgid "That command only works in IMs, not chats."
 msgstr "Este comando s坦 funciona em conversas, n達o em bate-papos."
 
-#: src/gtkconv.c:472
+#: src/gtkconv.c:477
 msgid "That command doesn't work on this protocol."
 msgstr "Este comando n達o funciona neste protocolo."
 
-#: src/gtkconv.c:699 src/gtkconv.c:725
+#: src/gtkconv.c:704 src/gtkconv.c:730
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Este amigo n達o est叩 no mesmo protocolo deste bate-papo"
 
-#: src/gtkconv.c:719
+#: src/gtkconv.c:724
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr "Voc棚 n達o est叩 conectado com uma conta que permita convidar este amigo."
 
-#: src/gtkconv.c:772
+#: src/gtkconv.c:777
 msgid "Invite Buddy Into Chat Room"
 msgstr "Convidar amigo para sala de bate-papo"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:802
+#: src/gtkconv.c:807
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2388,295 +2444,293 @@
 "Favor digitar o nome do usu叩rio que voc棚 gostaria de convidar, junto com uma "
 "mensagem de convite opcional."
 
-#: src/gtkconv.c:823
+#: src/gtkconv.c:828
 msgid "_Buddy:"
 msgstr "_Amigo:"
 
-#: src/gtkconv.c:843 src/gtksavedstatuses.c:836
+#: src/gtkconv.c:848 src/gtksavedstatuses.c:1060 src/gtksavedstatuses.c:1357
 msgid "_Message:"
 msgstr "_Mensagem:"
 
-#: src/gtkconv.c:900 src/gtkconv.c:2228 src/gtkdebug.c:217 src/gtkft.c:470
+#: src/gtkconv.c:905 src/gtkconv.c:2235 src/gtkdebug.c:217 src/gtkft.c:472
 msgid "Unable to open file."
 msgstr "Imposs鱈vel abrir arquivo."
 
-#: src/gtkconv.c:906
+#: src/gtkconv.c:911
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversas com %s</h1>\n"
 
-#: src/gtkconv.c:930
+#: src/gtkconv.c:935
 msgid "Save Conversation"
 msgstr "Salvar conversa"
 
-#: src/gtkconv.c:1030 src/gtkdebug.c:165 src/gtkdebug.c:678
+#: src/gtkconv.c:1035 src/gtkdebug.c:165 src/gtkdebug.c:678
 msgid "Find"
 msgstr "Procurar"
 
-#: src/gtkconv.c:1056 src/gtkdebug.c:193
+#: src/gtkconv.c:1061 src/gtkdebug.c:193
 msgid "_Search for:"
 msgstr "_Procurar por:"
 
-#: src/gtkconv.c:1227
-#, fuzzy
+#: src/gtkconv.c:1232
 msgid "Logging started. Future messages in this conversation will be logged."
-msgstr "Grava巽達o dessa conversa falhou"
-
-#: src/gtkconv.c:1235
-#, fuzzy
+msgstr "Grava巽達o iniciada. Futuras mensagens nesta conversa ser達o gravadas."
+
+#: src/gtkconv.c:1240
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
-msgstr "Grava巽達o dessa conversa falhou"
-
-#: src/gtkconv.c:1489
+msgstr ""
+"Grava巽達o interrompida. Futuras mensagens nesta conversa n達o ser達o gravadas."
+
+#: src/gtkconv.c:1496
 msgid "IM"
 msgstr "MI"
 
-#: src/gtkconv.c:1495 src/protocols/oscar/oscar.c:628
+#: src/gtkconv.c:1502 src/protocols/oscar/oscar.c:629
 msgid "Send File"
 msgstr "Enviar arquivo"
 
-#: src/gtkconv.c:1502
+#: src/gtkconv.c:1509
 msgid "Un-Ignore"
 msgstr "Des-ignorar"
 
-#: src/gtkconv.c:1505
+#: src/gtkconv.c:1512
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: src/gtkconv.c:1511
+#: src/gtkconv.c:1518
 msgid "Info"
 msgstr "Info"
 
-#: src/gtkconv.c:1517
+#: src/gtkconv.c:1524
 msgid "Get Away Message"
 msgstr "Obter mensagem de aus棚ncia"
 
-#: src/gtkconv.c:1524 src/gtkrequest.c:267
+#: src/gtkconv.c:1531 src/gtkrequest.c:267
 msgid "Remove"
 msgstr "Remover"
 
-#: src/gtkconv.c:2236
+#: src/gtkconv.c:2243
 msgid "Unable to save icon file to disk."
 msgstr "Imposs鱈vel salvar arquivo de 鱈cone no disco."
 
-#: src/gtkconv.c:2259
+#: src/gtkconv.c:2266
 msgid "Save Icon"
 msgstr "Salvar 鱈cone"
 
-#: src/gtkconv.c:2308
+#: src/gtkconv.c:2315
 msgid "Animate"
 msgstr "Animar"
 
-#: src/gtkconv.c:2313
+#: src/gtkconv.c:2320
 msgid "Hide Icon"
 msgstr "Ocultar 鱈cone"
 
-#: src/gtkconv.c:2319
+#: src/gtkconv.c:2326
 msgid "Save Icon As..."
 msgstr "Salvar 鱈cone como..."
 
 #. Conversation menu
-#: src/gtkconv.c:2367
+#: src/gtkconv.c:2415
 msgid "/_Conversation"
 msgstr "/_Conversa"
 
-#: src/gtkconv.c:2369
+#: src/gtkconv.c:2417
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversa/Nova _mensagem instant但nea..."
 
-#: src/gtkconv.c:2374
+#: src/gtkconv.c:2422
 msgid "/Conversation/_Find..."
 msgstr "/Conversa/_Procurar..."
 
-#: src/gtkconv.c:2376
+#: src/gtkconv.c:2424
 msgid "/Conversation/View _Log"
 msgstr "/Conversa/Ver _log"
 
-#: src/gtkconv.c:2377
+#: src/gtkconv.c:2425
 msgid "/Conversation/_Save As..."
 msgstr "/Conversa/_Salvar como..."
 
-#: src/gtkconv.c:2379
+#: src/gtkconv.c:2427
 msgid "/Conversation/Clear"
 msgstr "/Conversa/Limpar"
 
-#: src/gtkconv.c:2383
+#: src/gtkconv.c:2431
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversa/E_nviar arquivo..."
 
-#: src/gtkconv.c:2384
+#: src/gtkconv.c:2432
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversa/Adicionar notifica巽達o de a_migo..."
 
-#: src/gtkconv.c:2386
+#: src/gtkconv.c:2434
 msgid "/Conversation/_Get Info"
 msgstr "/Conversa/_Ver informa巽探es"
 
-#: src/gtkconv.c:2388
+#: src/gtkconv.c:2436
 msgid "/Conversation/In_vite..."
 msgstr "/Conversa/_Convidar..."
 
-#: src/gtkconv.c:2393
+#: src/gtkconv.c:2441
 msgid "/Conversation/Al_ias..."
 msgstr "/Conversa/A_pelidar..."
 
-#: src/gtkconv.c:2395
+#: src/gtkconv.c:2443
 msgid "/Conversation/_Block..."
 msgstr "/Conversa/_Bloquear..."
 
-#: src/gtkconv.c:2397
+#: src/gtkconv.c:2445
 msgid "/Conversation/_Add..."
 msgstr "/Conversa/A_dicionar..."
 
-#: src/gtkconv.c:2399
+#: src/gtkconv.c:2447
 msgid "/Conversation/_Remove..."
 msgstr "/Conversa/_Remover..."
 
-#: src/gtkconv.c:2404
+#: src/gtkconv.c:2452
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Conversa/Inserir lin_k..."
 
-#: src/gtkconv.c:2406
+#: src/gtkconv.c:2454
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversa/Inserir imag_em..."
 
-#: src/gtkconv.c:2411
+#: src/gtkconv.c:2459
 msgid "/Conversation/_Close"
 msgstr "/Conversa/_Fechar"
 
 #. Options
-#: src/gtkconv.c:2415
+#: src/gtkconv.c:2463
 msgid "/_Options"
 msgstr "/_Op巽探es"
 
-#: src/gtkconv.c:2416
+#: src/gtkconv.c:2464
 msgid "/Options/Enable _Logging"
 msgstr "/Op巽探es/Gravar _log"
 
-#: src/gtkconv.c:2417
+#: src/gtkconv.c:2465
 msgid "/Options/Enable _Sounds"
 msgstr "/Op巽探es/Ativar _sons"
 
-#: src/gtkconv.c:2418
+#: src/gtkconv.c:2466
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Op巽探es/Mostrar barras de ferramen_tas de formata巽達o"
 
-#: src/gtkconv.c:2419
+#: src/gtkconv.c:2467
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Op巽探es/Mostrar marca巽探es de t_empo"
 
-#: src/gtkconv.c:2420
+#: src/gtkconv.c:2468
 msgid "/Options/Show Buddy _Icon"
 msgstr "/Op巽探es/Mostrar _鱈cones de amigos"
 
-#: src/gtkconv.c:2460
+#: src/gtkconv.c:2508
 msgid "/Conversation/View Log"
 msgstr "/Conversa/Ver log"
 
-#: src/gtkconv.c:2466
+#: src/gtkconv.c:2514
 msgid "/Conversation/Send File..."
 msgstr "/Conversa/Enviar arquivo..."
 
-#: src/gtkconv.c:2470
+#: src/gtkconv.c:2518
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversa/Adicionar notifica巽達o de amigo..."
 
-#: src/gtkconv.c:2476
+#: src/gtkconv.c:2524
 msgid "/Conversation/Get Info"
 msgstr "/Conversa/Ver informa巽探es"
 
-#: src/gtkconv.c:2480
+#: src/gtkconv.c:2528
 msgid "/Conversation/Invite..."
 msgstr "/Conversa/Convidar..."
 
-#: src/gtkconv.c:2486
+#: src/gtkconv.c:2534
 msgid "/Conversation/Alias..."
 msgstr "/Conversa/Apelido..."
 
-#: src/gtkconv.c:2490
+#: src/gtkconv.c:2538
 msgid "/Conversation/Block..."
 msgstr "/Conversa/Bloquear..."
 
-#: src/gtkconv.c:2494
+#: src/gtkconv.c:2542
 msgid "/Conversation/Add..."
 msgstr "/Conversa/Adicionar..."
 
-#: src/gtkconv.c:2498
+#: src/gtkconv.c:2546
 msgid "/Conversation/Remove..."
 msgstr "/Conversa/Remover..."
 
-#: src/gtkconv.c:2504
+#: src/gtkconv.c:2552
 msgid "/Conversation/Insert Link..."
 msgstr "/Conversa/Inserir link..."
 
-#: src/gtkconv.c:2508
+#: src/gtkconv.c:2556
 msgid "/Conversation/Insert Image..."
 msgstr "/Conversa/Inserir imagem..."
 
-#: src/gtkconv.c:2514
+#: src/gtkconv.c:2562
 msgid "/Options/Enable Logging"
 msgstr "/Op巽探es/Gravar log"
 
-#: src/gtkconv.c:2517
+#: src/gtkconv.c:2565
 msgid "/Options/Enable Sounds"
 msgstr "/Op巽探es/Ativar sons"
 
-#: src/gtkconv.c:2520
+#: src/gtkconv.c:2568
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Op巽探es/Mostrar barras de ferramentas de formata巽達o"
 
-#: src/gtkconv.c:2523
+#: src/gtkconv.c:2571
 msgid "/Options/Show Timestamps"
 msgstr "/Op巽探es/Mostrar marca巽探es de tempo"
 
-#: src/gtkconv.c:2526
+#: src/gtkconv.c:2574
 msgid "/Options/Show Buddy Icon"
 msgstr "/Op巽探esMostrar 鱈_cones de amigos"
 
-#: src/gtkconv.c:2597
+#: src/gtkconv.c:2646
 msgid "User is typing..."
 msgstr "O usu叩rio est叩 digitando..."
 
-#: src/gtkconv.c:2602
-msgid "User has typed something and paused"
+#: src/gtkconv.c:2649
+msgid "User has typed something and stopped"
 msgstr "O usu叩rio digitou algo e parou"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2740
-#, fuzzy
+#: src/gtkconv.c:2798
 msgid "_Send To"
-msgstr "_Enviar como"
-
-#: src/gtkconv.c:3373
+msgstr "_Enviar para"
+
+#: src/gtkconv.c:3429 src/protocols/sametime/sametime.c:3534
 msgid "Topic:"
 msgstr "T坦pico:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3421
+#: src/gtkconv.c:3477
 msgid "0 people in room"
 msgstr "0 pessoas na sala"
 
-#: src/gtkconv.c:3500
+#: src/gtkconv.c:3556
 msgid "IM the user"
 msgstr "Mandar uma mensagem instant但nea para o usu叩rio"
 
-#: src/gtkconv.c:3513
+#: src/gtkconv.c:3569
 msgid "Ignore the user"
 msgstr "Ignorar o usu叩rio"
 
-#: src/gtkconv.c:3525
+#: src/gtkconv.c:3581
 msgid "Get the user's information"
 msgstr "Ver informa巽探es do usu叩rio"
 
-#: src/gtkconv.c:4360 src/gtkconv.c:4462 src/gtkconv.c:4517
+#: src/gtkconv.c:4438 src/gtkconv.c:4543 src/gtkconv.c:4598
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d pessoa na sala"
 msgstr[1] "%d pessoas na sala"
 
-#: src/gtkconv.c:5582
+#: src/gtkconv.c:5780
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -2684,12 +2738,12 @@
 "say &lt;mensagem&gt;:  Envia uma mensagem normalmente, como se voc棚 n達o "
 "estivesse usando um comando."
 
-#: src/gtkconv.c:5585
+#: src/gtkconv.c:5783
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;a巽達o&gt;:  Envia uma a巽達o do tipo do IRC para um amigo ou bate-papo."
 
-#: src/gtkconv.c:5588
+#: src/gtkconv.c:5786
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -2697,43 +2751,43 @@
 "debug &lt;op巽達o&gt;:  Envia v叩rias informa巽探es de depura巽達o para a conversa "
 "atual."
 
-#: src/gtkconv.c:5591
+#: src/gtkconv.c:5789
 msgid "clear: Clears the conversation scrollback."
 msgstr "limpar: Limpar a janela de conversa."
 
-#: src/gtkconv.c:5594
+#: src/gtkconv.c:5792
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;comando&gt;:  Ajuda num comando espec鱈fico."
 
-#: src/gtkconv.c:5709
+#: src/gtkconv.c:5922
 msgid "Confirm close"
 msgstr "Confirmar fechamento"
 
-#: src/gtkconv.c:5741
+#: src/gtkconv.c:5954
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "Voc棚 tem mensagens n達o lidas. Tem certeza que deseja fechar a janela?"
 
-#: src/gtkconv.c:6408
+#: src/gtkconv.c:6740
 msgid "Close conversation"
 msgstr "Fechar conversa"
 
-#: src/gtkconv.c:6872
+#: src/gtkconv.c:7209
 msgid "Last created window"
 msgstr "�ltima janela criada"
 
-#: src/gtkconv.c:6874
+#: src/gtkconv.c:7211
 msgid "Separate IM and Chat windows"
 msgstr "Janelas separadas de mensagens instant但neas e bate-papos"
 
-#: src/gtkconv.c:6876 src/gtkprefs.c:1205
+#: src/gtkconv.c:7213 src/gtkprefs.c:1223
 msgid "New window"
 msgstr "Nova janela"
 
-#: src/gtkconv.c:6878
+#: src/gtkconv.c:7215
 msgid "By group"
 msgstr "Por grupo"
 
-#: src/gtkconv.c:6880
+#: src/gtkconv.c:7217
 msgid "By account"
 msgstr "Por conta"
 
@@ -2773,206 +2827,213 @@
 msgid "Right click for more options."
 msgstr "Clique com o bot達o direito para mostrar mais op巽探es"
 
-#: src/gtkdialogs.c:59 src/gtkdialogs.c:90
+#: src/gtkdialogs.c:60 src/gtkdialogs.c:97
 msgid "lead developer"
 msgstr "desenvolvedor principal"
 
-#: src/gtkdialogs.c:60 src/gtkdialogs.c:63 src/gtkdialogs.c:64
-#: src/gtkdialogs.c:65 src/gtkdialogs.c:66 src/gtkdialogs.c:67
-#: src/gtkdialogs.c:69 src/gtkdialogs.c:70 src/gtkdialogs.c:71
+#: src/gtkdialogs.c:61 src/gtkdialogs.c:62 src/gtkdialogs.c:64
+#: src/gtkdialogs.c:66 src/gtkdialogs.c:67 src/gtkdialogs.c:68
+#: src/gtkdialogs.c:69 src/gtkdialogs.c:71 src/gtkdialogs.c:72
 msgid "developer"
 msgstr "desenvolvedor"
 
-#: src/gtkdialogs.c:61
-msgid "developer & webmaster"
-msgstr "desenvolvedor & webmaster"
-
-#: src/gtkdialogs.c:62
+#: src/gtkdialogs.c:63
 msgid "win32 port"
 msgstr "port para Win32"
 
-#: src/gtkdialogs.c:68
+#: src/gtkdialogs.c:65
+msgid "developer & webmaster"
+msgstr "desenvolvedor & webmaster"
+
+#: src/gtkdialogs.c:70
 msgid "support"
 msgstr "suporte"
 
-#: src/gtkdialogs.c:88 src/gtkdialogs.c:91
+#: src/gtkdialogs.c:91 src/gtkdialogs.c:92
 msgid "maintainer"
 msgstr "mantenedor"
 
-#: src/gtkdialogs.c:89
+#: src/gtkdialogs.c:93
 msgid "libfaim maintainer"
 msgstr "mantenedor da libfaim"
 
-#: src/gtkdialogs.c:92
-msgid "Jabber developer"
-msgstr "desenvolvedor do Jabber"
-
-#: src/gtkdialogs.c:93
-msgid "original author"
-msgstr "autor original"
-
 #: src/gtkdialogs.c:94
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker e dirigente designado [vagabundo pregui巽oso]"
 
-#: src/gtkdialogs.c:99 src/gtkdialogs.c:100 src/gtkdialogs.c:144
+#: src/gtkdialogs.c:95
+msgid "Jabber developer"
+msgstr "desenvolvedor do Jabber"
+
+#: src/gtkdialogs.c:96
+msgid "original author"
+msgstr "autor original"
+
+#: src/gtkdialogs.c:103 src/gtkdialogs.c:104 src/gtkdialogs.c:151
 msgid "Bulgarian"
 msgstr "B炭lgaro"
 
-#: src/gtkdialogs.c:101
-#, fuzzy
+#: src/gtkdialogs.c:105
 msgid "Bosnian"
-msgstr "Romeno"
-
-#: src/gtkdialogs.c:102 src/gtkdialogs.c:145 src/gtkdialogs.c:146
+msgstr "B坦snio"
+
+#: src/gtkdialogs.c:106 src/gtkdialogs.c:152 src/gtkdialogs.c:153
 msgid "Catalan"
 msgstr "Catal達o"
 
-#: src/gtkdialogs.c:103 src/gtkdialogs.c:147
+#: src/gtkdialogs.c:107 src/gtkdialogs.c:154
 msgid "Czech"
 msgstr "Tcheco"
 
-#: src/gtkdialogs.c:104
+#: src/gtkdialogs.c:108
 msgid "Danish"
 msgstr "Dinamarqu棚s"
 
-#: src/gtkdialogs.c:105 src/gtkdialogs.c:148
+#: src/gtkdialogs.c:109 src/gtkdialogs.c:155
 msgid "German"
 msgstr "Alem達o"
 
-#: src/gtkdialogs.c:106
+#: src/gtkdialogs.c:110 src/gtkdialogs.c:111
+msgid "Greek"
+msgstr "Grego"
+
+#: src/gtkdialogs.c:112
 msgid "Australian English"
 msgstr "Ingl棚s australiano"
 
-#: src/gtkdialogs.c:107
-msgid "British English"
-msgstr "Ingl棚s brit但nico"
-
-#: src/gtkdialogs.c:108
+#: src/gtkdialogs.c:113
 msgid "Canadian English"
 msgstr "Ingl棚s canadense"
 
-#: src/gtkdialogs.c:109 src/gtkdialogs.c:149
+#: src/gtkdialogs.c:114
+msgid "British English"
+msgstr "Ingl棚s brit但nico"
+
+#: src/gtkdialogs.c:115 src/gtkdialogs.c:156
 msgid "Spanish"
 msgstr "Espanhol"
 
-#: src/gtkdialogs.c:110 src/gtkdialogs.c:150
+#: src/gtkdialogs.c:116 src/gtkdialogs.c:157
 msgid "Finnish"
 msgstr "Finland棚s"
 
-#: src/gtkdialogs.c:111 src/gtkdialogs.c:151
+#: src/gtkdialogs.c:117 src/gtkdialogs.c:158
 msgid "French"
 msgstr "Franc棚s"
 
-#: src/gtkdialogs.c:112
+#: src/gtkdialogs.c:118
 msgid "Hebrew"
 msgstr "Hebraico"
 
-#: src/gtkdialogs.c:113
+#: src/gtkdialogs.c:119
 msgid "Hindi"
 msgstr "Hindu"
 
-#: src/gtkdialogs.c:114
+#: src/gtkdialogs.c:120
 msgid "Hungarian"
 msgstr "H炭ngaro"
 
-#: src/gtkdialogs.c:115 src/gtkdialogs.c:152
+#: src/gtkdialogs.c:121 src/gtkdialogs.c:159
 msgid "Italian"
 msgstr "Italiano"
 
-#: src/gtkdialogs.c:116 src/gtkdialogs.c:153
+#: src/gtkdialogs.c:122 src/gtkdialogs.c:160
 msgid "Japanese"
 msgstr "Japon棚s"
 
-#: src/gtkdialogs.c:117
-msgid "Lithuanian"
-msgstr "Lituano"
-
-#: src/gtkdialogs.c:118
+#: src/gtkdialogs.c:123
 msgid "Georgian"
 msgstr "Ge坦rgio"
 
-#: src/gtkdialogs.c:119 src/gtkdialogs.c:154
+#: src/gtkdialogs.c:124 src/gtkdialogs.c:161
 msgid "Korean"
 msgstr "Coreano"
 
-#: src/gtkdialogs.c:120
+#: src/gtkdialogs.c:125
+msgid "Kurdish"
+msgstr "Curdo"
+
+#: src/gtkdialogs.c:126
+msgid "Lithuanian"
+msgstr "Lituano"
+
+#: src/gtkdialogs.c:127
+msgid "Macedonian"
+msgstr "Maced担nio"
+
+#: src/gtkdialogs.c:128
 msgid "Dutch, Flemish"
 msgstr "Holand棚s; Flamengo"
 
-#: src/gtkdialogs.c:121
-msgid "Macedonian"
-msgstr "Maced担nio"
-
-#: src/gtkdialogs.c:122
+#: src/gtkdialogs.c:129
 msgid "Norwegian"
 msgstr "Noruegu棚s"
 
-#: src/gtkdialogs.c:123 src/gtkdialogs.c:124 src/gtkdialogs.c:155
+#: src/gtkdialogs.c:130 src/gtkdialogs.c:131 src/gtkdialogs.c:162
 msgid "Polish"
 msgstr "Polon棚s"
 
-#: src/gtkdialogs.c:125
+#: src/gtkdialogs.c:132
 msgid "Portuguese"
 msgstr "Portugu棚s"
 
-#: src/gtkdialogs.c:126
+#: src/gtkdialogs.c:133
 msgid "Portuguese-Brazil"
 msgstr "Portugu棚s do Brasil"
 
-#: src/gtkdialogs.c:127
+#: src/gtkdialogs.c:134
 msgid "Romanian"
 msgstr "Romeno"
 
-#: src/gtkdialogs.c:128 src/gtkdialogs.c:156 src/gtkdialogs.c:157
+#: src/gtkdialogs.c:135 src/gtkdialogs.c:163 src/gtkdialogs.c:164
 msgid "Russian"
 msgstr "Russo"
 
-#: src/gtkdialogs.c:129 src/gtkdialogs.c:130
+#: src/gtkdialogs.c:136 src/gtkdialogs.c:137
 msgid "Serbian"
 msgstr "S辿rvio"
 
-#: src/gtkdialogs.c:131
+#: src/gtkdialogs.c:138
 msgid "Slovenian"
 msgstr "Esloveno"
 
-#: src/gtkdialogs.c:132 src/gtkdialogs.c:159
+#: src/gtkdialogs.c:139 src/gtkdialogs.c:166
 msgid "Swedish"
 msgstr "Sueco"
 
-#: src/gtkdialogs.c:133
+#: src/gtkdialogs.c:140
 msgid "Telugu"
-msgstr ""
-
-#: src/gtkdialogs.c:134
+msgstr "Telugu"
+
+#: src/gtkdialogs.c:141
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: src/gtkdialogs.c:134
+#: src/gtkdialogs.c:141
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh e o time do Gnome-Vi"
 
-#: src/gtkdialogs.c:135 src/gtkdialogs.c:160
+#: src/gtkdialogs.c:142 src/gtkdialogs.c:167
 msgid "Simplified Chinese"
 msgstr "Chin棚s Simplificado"
 
-#: src/gtkdialogs.c:136 src/gtkdialogs.c:137 src/gtkdialogs.c:161
+#: src/gtkdialogs.c:143 src/gtkdialogs.c:144 src/gtkdialogs.c:168
 msgid "Traditional Chinese"
 msgstr "Chin棚s Tradicional"
 
-#: src/gtkdialogs.c:143
+#: src/gtkdialogs.c:150
 msgid "Amharic"
 msgstr "Amh叩rico"
 
-#: src/gtkdialogs.c:158
+#: src/gtkdialogs.c:165
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: src/gtkdialogs.c:202
+#: src/gtkdialogs.c:209
 msgid "About Gaim"
 msgstr "Sobre o Gaim"
 
-#: src/gtkdialogs.c:226
+#: src/gtkdialogs.c:233
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
@@ -2983,62 +3044,62 @@
 "Gadu-Gadu ao mesmo tempo. Ele 辿 escrito usando o GTK+ e 辿 licenciado sob a "
 "GPL.<BR><BR>"
 
-#: src/gtkdialogs.c:235
+#: src/gtkdialogs.c:242
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #Gaim no irc.freenode.net<BR><BR>"
 
-#: src/gtkdialogs.c:238
+#: src/gtkdialogs.c:245
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #Gaim no irc.freenode.net<BR><BR>"
 
-#: src/gtkdialogs.c:244
+#: src/gtkdialogs.c:251
 msgid "Active Developers"
 msgstr "Desenvolvedores ativos"
 
-#: src/gtkdialogs.c:259
+#: src/gtkdialogs.c:266
 msgid "Crazy Patch Writers"
 msgstr "Escritores de patch malucos"
 
-#: src/gtkdialogs.c:274
+#: src/gtkdialogs.c:281
 msgid "Retired Developers"
 msgstr "Desenvolvedores aposentados"
 
-#: src/gtkdialogs.c:289
+#: src/gtkdialogs.c:296
 msgid "Current Translators"
 msgstr "Atuais tradutores"
 
-#: src/gtkdialogs.c:309
+#: src/gtkdialogs.c:316
 msgid "Past Translators"
 msgstr "Antigos tradutores"
 
-#: src/gtkdialogs.c:327
+#: src/gtkdialogs.c:334
 msgid "Debugging Information"
 msgstr "Informa巽探es de depura巽達o"
 
-#: src/gtkdialogs.c:489 src/gtkdialogs.c:630 src/gtkdialogs.c:685
+#: src/gtkdialogs.c:508 src/gtkdialogs.c:645 src/gtkdialogs.c:700
 msgid "_Name"
 msgstr "_Nome"
 
-#: src/gtkdialogs.c:494 src/gtkdialogs.c:635 src/gtkdialogs.c:690
+#: src/gtkdialogs.c:513 src/gtkdialogs.c:650 src/gtkdialogs.c:705
 msgid "_Account"
 msgstr "_Conta"
 
-#: src/gtkdialogs.c:502
+#: src/gtkdialogs.c:521
 msgid "New Instant Message"
 msgstr "Nova mensagem instant但nea"
 
-#: src/gtkdialogs.c:504
+#: src/gtkdialogs.c:523
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr ""
 "Por favor digite o nome de usu叩rio ou apelido da pessoa com quem voc棚 deseja "
 "conversar."
 
-#: src/gtkdialogs.c:643
+#: src/gtkdialogs.c:658
 msgid "Get User Info"
 msgstr "Ver informa巽探es do usu叩rio"
 
-#: src/gtkdialogs.c:645
+#: src/gtkdialogs.c:660
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
@@ -3046,11 +3107,11 @@
 "Por favor digite o nome de usu叩rio ou apelido da pessoa cujas informa巽探es "
 "voc棚 deseja ver."
 
-#: src/gtkdialogs.c:699
+#: src/gtkdialogs.c:714
 msgid "View User Log"
 msgstr "Ver log do usu叩rio"
 
-#: src/gtkdialogs.c:701
+#: src/gtkdialogs.c:716
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
@@ -3058,38 +3119,38 @@
 "Por favor digite o nome de usu叩rio ou apelido da pessoa cujo log voc棚 "
 "gostaria de ver."
 
-#: src/gtkdialogs.c:720
+#: src/gtkdialogs.c:735
 msgid "Alias Contact"
 msgstr "Apelidar contato"
 
-#: src/gtkdialogs.c:721
+#: src/gtkdialogs.c:736
 msgid "Enter an alias for this contact."
 msgstr "Digite um apelido para este contato."
 
-#: src/gtkdialogs.c:723 src/gtkdialogs.c:745 src/gtkdialogs.c:765
-#: src/gtkrequest.c:269 src/protocols/silc/chat.c:585
+#: src/gtkdialogs.c:738 src/gtkdialogs.c:760 src/gtkdialogs.c:780
+#: src/gtkrequest.c:269 src/protocols/silc/chat.c:586
 msgid "Alias"
 msgstr "Apelido:"
 
-#: src/gtkdialogs.c:741
+#: src/gtkdialogs.c:756
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Digite um apelido para %s."
 
-#: src/gtkdialogs.c:743
+#: src/gtkdialogs.c:758
 msgid "Alias Buddy"
 msgstr "Apelidar amigo"
 
-#: src/gtkdialogs.c:762
+#: src/gtkdialogs.c:777
 msgid "Alias Chat"
 msgstr "Apelidar bate-papo"
 
-#: src/gtkdialogs.c:763
+#: src/gtkdialogs.c:778
 msgid "Enter an alias for this chat."
 msgstr "Digite um apelido para este bate-papo."
 
-#: src/gtkdialogs.c:800
-#, fuzzy, c-format
+#: src/gtkdialogs.c:815
+#, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
 "your buddy list.  Do you want to continue?"
@@ -3097,13 +3158,13 @@
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
 msgstr[0] ""
-"Voc棚 est叩 prestes a remover o bate-papo %s da sua lista de amigos. Deseja "
-"continuar?"
+"Voc棚 est叩 prestes a remover o contato que cont辿m %s e %d outro amigo da sua "
+"lista de amigos. Deseja continuar?"
 msgstr[1] ""
-"Voc棚 est叩 prestes a remover o bate-papo %s da sua lista de amigos. Deseja "
-"continuar?"
-
-#: src/gtkdialogs.c:867
+"Voc棚 est叩 prestes a remover o contato que cont辿m %s e %d outros amigos da "
+"sua lista de amigos. Deseja continuar?"
+
+#: src/gtkdialogs.c:882
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -3112,22 +3173,22 @@
 "Voc棚 est叩 prestes a remover o grupo %s e todos os seus membros da sua lista "
 "de amigos. Deseja continuar?"
 
-#: src/gtkdialogs.c:870 src/gtkdialogs.c:871
+#: src/gtkdialogs.c:885 src/gtkdialogs.c:886
 msgid "Remove Group"
 msgstr "Remover grupo"
 
-#: src/gtkdialogs.c:909
+#: src/gtkdialogs.c:924
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr ""
 "Voc棚 est叩 prestes a remover %s da sua lista de amigos. Deseja continuar?"
 
-#: src/gtkdialogs.c:912 src/gtkdialogs.c:913
+#: src/gtkdialogs.c:927 src/gtkdialogs.c:928
 msgid "Remove Buddy"
 msgstr "Remover amigo"
 
-#: src/gtkdialogs.c:951
+#: src/gtkdialogs.c:966
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -3136,138 +3197,136 @@
 "Voc棚 est叩 prestes a remover o bate-papo %s da sua lista de amigos. Deseja "
 "continuar?"
 
-#: src/gtkdialogs.c:954 src/gtkdialogs.c:955
+#: src/gtkdialogs.c:969 src/gtkdialogs.c:970
 msgid "Remove Chat"
 msgstr "Remover bate-papo"
 
-#: src/gtkft.c:138
+#: src/gtkft.c:139
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KB/s"
 
-#: src/gtkft.c:159 src/gtkft.c:1035
+#: src/gtkft.c:160 src/gtkft.c:1049
 msgid "Finished"
 msgstr "Conclu鱈da"
 
-#: src/gtkft.c:162 src/gtkft.c:986
+#: src/gtkft.c:163 src/gtkft.c:989
 msgid "Canceled"
 msgstr "Cancelada"
 
-#: src/gtkft.c:165 src/gtkft.c:905
+#: src/gtkft.c:166 src/gtkft.c:908
 msgid "Waiting for transfer to begin"
 msgstr "Esperando o come巽o da transfer棚ncia"
 
-#: src/gtkft.c:218
+#: src/gtkft.c:220
 msgid "<b>Receiving As:</b>"
 msgstr "<b>Recebendo como:</b>"
 
-#: src/gtkft.c:220
+#: src/gtkft.c:222
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Recebendo de:</b>"
 
-#: src/gtkft.c:224
+#: src/gtkft.c:226
 msgid "<b>Sending To:</b>"
 msgstr "<b>Enviando para:</b>"
 
-#: src/gtkft.c:226
+#: src/gtkft.c:228
 msgid "<b>Sending As:</b>"
 msgstr "<b>Enviando como:</b>"
 
-#: src/gtkft.c:442
+#: src/gtkft.c:444
 msgid "There is no application configured to open this type of file."
 msgstr "N達o h叩 um aplicativo configurado para abrir este tipo de arquivo."
 
-#: src/gtkft.c:447
+#: src/gtkft.c:449
 msgid "An error occurred while opening the file."
 msgstr "Ocorreu um erro na abertura do arquivo."
 
-#: src/gtkft.c:467
+#: src/gtkft.c:469
 #, c-format
 msgid "Error launching %s: %s"
 msgstr "Erro ao executar %s: %s"
 
-#: src/gtkft.c:476
+#: src/gtkft.c:478
 #, c-format
 msgid "Error running %s"
 msgstr "Erro ao rodar %s"
 
-#: src/gtkft.c:477
+#: src/gtkft.c:479
 #, c-format
 msgid "Process returned error code %d"
 msgstr "Processo retornou c坦digo de erro %d"
 
-#: src/gtkft.c:572
+#: src/gtkft.c:574
 msgid "Progress"
 msgstr "Progresso"
 
-#: src/gtkft.c:579
+#: src/gtkft.c:581
 msgid "Filename"
 msgstr "Nome do arquivo"
 
-#: src/gtkft.c:586
+#: src/gtkft.c:588
 msgid "Size"
 msgstr "Tamanho"
 
-#: src/gtkft.c:593
+#: src/gtkft.c:595
 msgid "Remaining"
 msgstr "Restante"
 
-#: src/gtkft.c:624
+#: src/gtkft.c:626
 msgid "Filename:"
 msgstr "Nome do arquivo:"
 
-#: src/gtkft.c:625
+#: src/gtkft.c:627
 msgid "Local File:"
 msgstr "Arquivo local:"
 
-#: src/gtkft.c:626
+#: src/gtkft.c:628
 msgid "Status:"
 msgstr "Status:"
 
-#: src/gtkft.c:627
+#: src/gtkft.c:629
 msgid "Speed:"
 msgstr "Velocidade:"
 
-#: src/gtkft.c:628
+#: src/gtkft.c:630
 msgid "Time Elapsed:"
 msgstr "Tempo decorrido:"
 
-#: src/gtkft.c:629
+#: src/gtkft.c:631
 msgid "Time Remaining:"
 msgstr "Tempo restante:"
 
-#: src/gtkft.c:715
-msgid "_Keep the dialog open"
-msgstr "_Manter a janela aberta"
-
-#: src/gtkft.c:725
-#, fuzzy
+#: src/gtkft.c:717
+msgid "_Close this window when all transfers finish"
+msgstr "_Feche esta janela quando todas as transfer棚ncias acabarem"
+
+#: src/gtkft.c:727
 msgid "C_lear finished transfers"
 msgstr "_Limpar transfer棚ncias conclu鱈das"
 
 #. "Download Details" arrow
-#: src/gtkft.c:734
-#, fuzzy
+#: src/gtkft.c:736
 msgid "File transfer _details"
-msgstr "Ocultar detalhes da transfer棚ncia"
+msgstr "_Detalhes da transfer棚ncia de arquivos"
 
 #. Pause button
-#: src/gtkft.c:764 src/gtkstock.c:122
+#: src/gtkft.c:766 src/gtkstock.c:124
 msgid "_Pause"
 msgstr "_Pausar"
 
 #. Resume button
-#: src/gtkft.c:774
+#: src/gtkft.c:776
 msgid "_Resume"
 msgstr "_Continuar"
 
-#: src/gtkft.c:988
+#: src/gtkft.c:991
 msgid "Failed"
 msgstr "Falhou"
 
 #: src/gtkimhtml.c:816
-msgid "Pa_ste As Text"
-msgstr "Co_lar como texto"
+msgid "Pa_ste as Plain Text"
+msgstr "Co_lar como texto puro"
 
 #: src/gtkimhtml.c:1313
 msgid "Hyperlink color"
@@ -3278,9 +3337,8 @@
 msgstr "Cor a ser usada para desenhar os hyperlinks."
 
 #: src/gtkimhtml.c:1317
-#, fuzzy
 msgid "Hyperlink prelight color"
-msgstr "Cor do hyperlink"
+msgstr "Cor do hyperlink iluminado"
 
 #: src/gtkimhtml.c:1318
 msgid "Color to draw hyperlinks when mouse is over them."
@@ -3300,7 +3358,7 @@
 msgid "_Copy Link Location"
 msgstr "_Copiar endere巽o do link"
 
-#: src/gtkimhtml.c:3234
+#: src/gtkimhtml.c:3241
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -3310,7 +3368,7 @@
 "\n"
 "substituindo揃para揃PNG."
 
-#: src/gtkimhtml.c:3237
+#: src/gtkimhtml.c:3244
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -3320,7 +3378,7 @@
 "\n"
 "substituindo para PNG."
 
-#: src/gtkimhtml.c:3250
+#: src/gtkimhtml.c:3257
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -3331,7 +3389,7 @@
 "\n"
 "%s"
 
-#: src/gtkimhtml.c:3253
+#: src/gtkimhtml.c:3260
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -3342,11 +3400,11 @@
 "\n"
 "%s"
 
-#: src/gtkimhtml.c:3333 src/gtkimhtml.c:3345
+#: src/gtkimhtml.c:3340 src/gtkimhtml.c:3352
 msgid "Save Image"
 msgstr "Salvar imagem"
 
-#: src/gtkimhtml.c:3373
+#: src/gtkimhtml.c:3380
 msgid "_Save Image..."
 msgstr "_Salvar imagem..."
 
@@ -3467,40 +3525,35 @@
 msgstr "Conversas com %s em %s"
 
 #: src/gtklog.c:309
-#, fuzzy
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
 msgstr ""
-"Eventos do sistemas ser達o gravados somente se a op巽達o <span style=\"italic"
-"\">Ativar logs do sistema</span> estiver ativada."
+"Eventos do sistema ser達o gravados somente se a op巽達o \"Gravar todas as "
+"mudan巽as de status no log do sistema\" estiver ativada."
 
 #: src/gtklog.c:313
-#, fuzzy
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
 msgstr ""
-"Mensagens instant但neas ser達o gravadas somente se a op巽達o <span style=\"italic"
-"\">Gravar todas as mensagens instant但neas</span> estiver ativada."
+"Mensagens instant但neas ser達o gravadas somente se a op巽達o \"Gravar todas as "
+"mensagens instant但nteas\" estiver ativada."
 
 #: src/gtklog.c:316
-#, fuzzy
-msgid ""
-"Chats will only be logged if the \"Log all chats preference\" is enabled."
-msgstr ""
-"Bate-papos ser達o gravados somente se a op巽達o <span style=\"italic\">Gravar "
-"todos os bate-papos</span> estiver ativada."
+msgid ""
+"Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgstr ""
+"Bate-papos ser達o gravados somente se a op巽達o \"Gravar todos os bate-papos\" "
+"estiver ativada."
 
 #: src/gtklog.c:320
-#, fuzzy
 msgid "No logs were found"
-msgstr "Nenhum log encontrado"
+msgstr "Nenhum log foi encontrado"
 
 #: src/gtklog.c:396
-#, fuzzy
 msgid "Total log size:"
-msgstr "Por tamanho do log"
+msgstr "Tamanho total do log:"
 
 #: src/gtklog.c:472
 #, c-format
@@ -3516,13 +3569,13 @@
 msgid "System Log"
 msgstr "Log do sistema"
 
-#: src/gtkmain.c:326
+#: src/gtkmain.c:330
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s. Tente `%s -h' para mais informa巽探es.\n"
 
-#: src/gtkmain.c:328
-#, fuzzy, c-format
+#: src/gtkmain.c:332
+#, c-format
 msgid ""
 "Gaim %s\n"
 "Usage: %s [OPTION]...\n"
@@ -3538,7 +3591,6 @@
 "Gaim %s\n"
 "Uso: %s [OP��O]...\n"
 "\n"
-"  -a, --acct          mostra a janela do editor de contas\n"
 "  -c, --config=DIR    usa o diret坦rio DIR para os arquivos de configura巽達o\n"
 "  -d, --debug         imprime mensagens de depura巽達o para a sa鱈da padr達o\n"
 "  -h, --help          exibe esta mensagem e sai\n"
@@ -3548,14 +3600,9 @@
 "                      a(s) conta(s) a usar, separadas por v鱈rgulas)\n"
 "  -v, --version       mostra a vers達o atual e sai\n"
 
-#. TODO: Should save the previous status as a transient status?
-#. Save the newly selected status to prefs.xml and status.xml
-#: src/gtkmain.c:676 src/gtkmain.c:678 src/gtkmain.c:681
-#: src/gtkstatusbox.c:663 src/gtkstatusbox.c:665 src/gtkstatusbox.c:668
-#: src/status.c:1696
-#, fuzzy
+#: src/gtkmain.c:684 src/gtkmain.c:686
 msgid "Default"
-msgstr "Padr達o do Gnome"
+msgstr "Padr達o"
 
 #. Descriptive label
 #: src/gtknotify.c:275
@@ -3601,7 +3648,7 @@
 msgid "Search Results"
 msgstr "Resultados da procura"
 
-#: src/gtknotify.c:643 src/protocols/oscar/oscar.c:4858
+#: src/gtknotify.c:643 src/protocols/oscar/oscar.c:4851
 #, c-format
 msgid "Info for %s"
 msgstr "Informa巽探es de %s:"
@@ -3632,6 +3679,21 @@
 "A op巽達o de comando do navegador 'Manual' foi escolhida, mas nenhum comando "
 "foi definido."
 
+#: src/gtkplugin.c:258
+#, c-format
+msgid ""
+"%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
+"<span weight=\"bold\">Web site:</span>\t\t%s\n"
+"<span weight=\"bold\">File name:</span>\t%s"
+msgstr ""
+"%s%s<span weight=\"bold\">Escrito por:</span>\t%s\n"
+"<span weight=\"bold\">P叩gina da web:</span>\t\t%s\n"
+"<span weight=\"bold\">Nome do arquivo:</span>\t%s"
+
+#: src/gtkplugin.c:401
+msgid "<b>Plugin Details</b>"
+msgstr "<b>Detalhes do plugin</b>"
+
 #: src/gtkpounce.c:130
 msgid "Select a file"
 msgstr "Selecione um arquivo"
@@ -3741,47 +3803,47 @@
 msgid "Remove Buddy Pounce"
 msgstr "Remover notifica巽達o de amigo"
 
-#: src/gtkpounce.c:964
+#: src/gtkpounce.c:966
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s come巽ou a digitar para voc棚 (%s)"
 
-#: src/gtkpounce.c:966
+#: src/gtkpounce.c:968
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s conectou (%s)"
 
-#: src/gtkpounce.c:968
+#: src/gtkpounce.c:970
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s voltou do estado 'Inativo' (%s)"
 
-#: src/gtkpounce.c:970
+#: src/gtkpounce.c:972
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s voltou do estado 'Ausente' (%s)"
 
-#: src/gtkpounce.c:972
+#: src/gtkpounce.c:974
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s parou de digitar para voc棚 (%s)"
 
-#: src/gtkpounce.c:974
+#: src/gtkpounce.c:976
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s desconectou (%s)"
 
-#: src/gtkpounce.c:976
+#: src/gtkpounce.c:978
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s se tornou inativo (%s)"
 
-#: src/gtkpounce.c:978
+#: src/gtkpounce.c:980
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s se tornou ausente. (%s)"
 
-#: src/gtkpounce.c:979
+#: src/gtkpounce.c:981
 msgid "Unknown pounce event. Please report this!"
 msgstr "Evento de notifica巽達o desconhecido. Por favor reporte isso!"
 
@@ -3802,31 +3864,39 @@
 msgid "Description"
 msgstr "Descri巽達o"
 
-#: src/gtkprefs.c:805
+#: src/gtkprefs.c:807
+msgid "_Hide new IM conversations"
+msgstr "Es_conder novas conversas"
+
+#: src/gtkprefs.c:810 src/gtkprefs.c:1674
+msgid "When away"
+msgstr "Quando ausente"
+
+#: src/gtkprefs.c:814
 msgid "Send unknown \"_slash\" commands as messages"
 msgstr "Enviar comando_s \"de barra\" desconhecidos como mensagens"
 
-#: src/gtkprefs.c:807
+#: src/gtkprefs.c:816
 msgid "Show _formatting on incoming messages"
 msgstr "Mostrar formata巽達o nas mensagen_s recebidas"
 
-#: src/gtkprefs.c:809
+#: src/gtkprefs.c:819
 msgid "Show buddy _icons"
 msgstr "Mostrar 鱈_cones de amigos"
 
-#: src/gtkprefs.c:811
+#: src/gtkprefs.c:821
 msgid "Enable buddy ic_on animation"
 msgstr "Ativar anima巽達o nos 鱈c_ones de amigos"
 
-#: src/gtkprefs.c:813
+#: src/gtkprefs.c:828
 msgid "_Notify buddies that you are typing to them"
 msgstr "_Notificar amigos de que voc棚 est叩 digitando para eles"
 
-#: src/gtkprefs.c:816
+#: src/gtkprefs.c:831
 msgid "_Highlight misspelled words"
 msgstr "Destacar palavras mal grafadas"
 
-#: src/gtkprefs.c:834
+#: src/gtkprefs.c:849
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
@@ -3835,162 +3905,160 @@
 "suportem formata巽達o. :)"
 
 #. All the tab options!
-#: src/gtkprefs.c:856
+#: src/gtkprefs.c:871
 msgid "Tab Options"
 msgstr "Op巽探es de abas"
 
-#: src/gtkprefs.c:858
+#: src/gtkprefs.c:873
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Mostrar mensagens instant但neas e bate-papos em janelas com _abas"
 
-#: src/gtkprefs.c:872
+#: src/gtkprefs.c:887
 msgid "Show close b_utton on tabs"
 msgstr "Mostrar o bot達o de _fechar nas abas"
 
-#: src/gtkprefs.c:878
+#: src/gtkprefs.c:893
 msgid "_Placement:"
 msgstr "Pos_i巽探es extras:"
 
-#: src/gtkprefs.c:880
+#: src/gtkprefs.c:895
 msgid "Top"
 msgstr "Cima"
 
-#: src/gtkprefs.c:881
+#: src/gtkprefs.c:896
 msgid "Bottom"
 msgstr "Baixo"
 
-#: src/gtkprefs.c:882
+#: src/gtkprefs.c:897
 msgid "Left"
 msgstr "Esquerda"
 
-#: src/gtkprefs.c:883
+#: src/gtkprefs.c:898
 msgid "Right"
 msgstr "Direita"
 
-#: src/gtkprefs.c:885
+#: src/gtkprefs.c:900
 msgid "Left Vertical"
-msgstr ""
-
-#: src/gtkprefs.c:886
+msgstr "Vertical (� esquerda)"
+
+#: src/gtkprefs.c:901
 msgid "Right Vertical"
-msgstr ""
-
-#: src/gtkprefs.c:891
+msgstr "Vertical (� direita)"
+
+#: src/gtkprefs.c:906
 msgid "N_ew conversations:"
 msgstr "N_ovas conversas:"
 
-#: src/gtkprefs.c:942 src/protocols/oscar/oscar.c:779
-#: src/protocols/oscar/oscar.c:5959
+#: src/gtkprefs.c:957 src/protocols/oscar/oscar.c:780
+#: src/protocols/oscar/oscar.c:5953
 msgid "IP Address"
 msgstr "Endere巽o IP"
 
-#: src/gtkprefs.c:944
-#, fuzzy
+#: src/gtkprefs.c:959
 msgid "STUN Server:"
-msgstr "_Servidor:"
-
-#: src/gtkprefs.c:946
+msgstr "Servidor STUN:"
+
+#: src/gtkprefs.c:961
 msgid "_Autodetect IP Address"
 msgstr "Detectar endere巽o IP _automaticamente"
 
-#: src/gtkprefs.c:955
+#: src/gtkprefs.c:970
 msgid "Public _IP:"
 msgstr "_IP p炭blico:"
 
-#: src/gtkprefs.c:979
+#: src/gtkprefs.c:994
 msgid "Ports"
 msgstr "Portas"
 
-#: src/gtkprefs.c:982
+#: src/gtkprefs.c:997
 msgid "_Manually specify range of ports to listen on"
 msgstr "Especificar _manualmente as portas a escutar"
 
-#: src/gtkprefs.c:985
+#: src/gtkprefs.c:1000
 msgid "_Start Port:"
 msgstr "_Porta inicial:"
 
-#: src/gtkprefs.c:992
+#: src/gtkprefs.c:1007
 msgid "_End Port:"
 msgstr "_Porta final:"
 
-#: src/gtkprefs.c:999
+#: src/gtkprefs.c:1015
 msgid "Proxy Server"
 msgstr "Servidor proxy"
 
-#: src/gtkprefs.c:1003
+#: src/gtkprefs.c:1019
 msgid "No proxy"
 msgstr "Nenhum proxy"
 
-#: src/gtkprefs.c:1059
+#: src/gtkprefs.c:1075
 msgid "_User:"
 msgstr "_Usu叩rio:"
 
-#: src/gtkprefs.c:1119
+#: src/gtkprefs.c:1137
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: src/gtkprefs.c:1120
+#: src/gtkprefs.c:1138
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1121
+#: src/gtkprefs.c:1139
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1122
+#: src/gtkprefs.c:1140
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1123
-#, fuzzy
+#: src/gtkprefs.c:1141
 msgid "GNOME Default"
-msgstr "Padr達o do Gnome"
-
-#: src/gtkprefs.c:1124
+msgstr "Padr達o do GNOME"
+
+#: src/gtkprefs.c:1142
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1125
+#: src/gtkprefs.c:1143
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1126
+#: src/gtkprefs.c:1144
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1127
+#: src/gtkprefs.c:1145
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1136
+#: src/gtkprefs.c:1154
 msgid "Manual"
 msgstr "Manual"
 
-#: src/gtkprefs.c:1189
+#: src/gtkprefs.c:1207
 msgid "Browser Selection"
 msgstr "Sele巽達o do navegador"
 
-#: src/gtkprefs.c:1193
+#: src/gtkprefs.c:1211
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: src/gtkprefs.c:1201
+#: src/gtkprefs.c:1219
 msgid "_Open link in:"
 msgstr "_Abrir link no:"
 
-#: src/gtkprefs.c:1203
+#: src/gtkprefs.c:1221
 msgid "Browser default"
 msgstr "Navegador padr達o"
 
-#: src/gtkprefs.c:1204
+#: src/gtkprefs.c:1222
 msgid "Existing window"
 msgstr "Janela existente"
 
-#: src/gtkprefs.c:1206
+#: src/gtkprefs.c:1224
 msgid "New tab"
 msgstr "Nova aba"
 
-#: src/gtkprefs.c:1220
+#: src/gtkprefs.c:1238
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3999,56 +4067,55 @@
 "_Manual:\n"
 "(%s para URL)"
 
-#: src/gtkprefs.c:1256 src/gtkprefs.c:1738
+#: src/gtkprefs.c:1274 src/gtkprefs.c:1757
 msgid "Logging"
 msgstr "Gravando"
 
-#: src/gtkprefs.c:1259
+#: src/gtkprefs.c:1277
 msgid "Log _Format:"
 msgstr "_Formato do log:"
 
-#: src/gtkprefs.c:1264
-#, fuzzy
+#: src/gtkprefs.c:1282
 msgid "Log all _instant messages"
-msgstr "_Gravar todas as mensagens instant但neas"
-
-#: src/gtkprefs.c:1266
+msgstr "Gravar todas as mensagens _instant但neas"
+
+#: src/gtkprefs.c:1284
 msgid "Log all c_hats"
 msgstr "Gravar todos os _bate-papos"
 
-#: src/gtkprefs.c:1268
+#: src/gtkprefs.c:1286
 msgid "Log all _status changes to system log"
-msgstr ""
-
-#: src/gtkprefs.c:1400
+msgstr "Gravar todas as mudan巽a_s de status no log do sistema"
+
+#: src/gtkprefs.c:1418
 msgid "Sound Selection"
 msgstr "Sele巽達o de som"
 
-#: src/gtkprefs.c:1454
+#: src/gtkprefs.c:1472
 msgid "Sound Method"
 msgstr "M辿todo para reproduzir o som"
 
-#: src/gtkprefs.c:1455
+#: src/gtkprefs.c:1473
 msgid "_Method:"
 msgstr "_M辿todo:"
 
-#: src/gtkprefs.c:1457
+#: src/gtkprefs.c:1475
 msgid "Console beep"
 msgstr "Bipe do console"
 
-#: src/gtkprefs.c:1459
+#: src/gtkprefs.c:1477
 msgid "Automatic"
 msgstr "Autom叩tico"
 
-#: src/gtkprefs.c:1464
+#: src/gtkprefs.c:1482
 msgid "Command"
 msgstr "Comando"
 
-#: src/gtkprefs.c:1465
+#: src/gtkprefs.c:1483
 msgid "No sounds"
 msgstr "Sem sons"
 
-#: src/gtkprefs.c:1473
+#: src/gtkprefs.c:1491
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4057,112 +4124,101 @@
 "C_omando do som:\n"
 "(%s para nome do arquivo)"
 
-#: src/gtkprefs.c:1499
+#: src/gtkprefs.c:1517
 msgid "Sound Options"
 msgstr "Op巽探es de som"
 
-#: src/gtkprefs.c:1500
+#: src/gtkprefs.c:1518
 msgid "Sounds when conversation has _focus"
 msgstr "Sons quando a janela da conversa _ganhar foco"
 
-#: src/gtkprefs.c:1502
+#: src/gtkprefs.c:1520
 msgid "_Sounds while away"
 msgstr "_Sons enquanto ausente"
 
-#: src/gtkprefs.c:1512
+#: src/gtkprefs.c:1530
 msgid "Sound Events"
 msgstr "Eventos de som"
 
-#: src/gtkprefs.c:1563
+#: src/gtkprefs.c:1581
 msgid "Play"
 msgstr "Tocar"
 
-#: src/gtkprefs.c:1570
+#: src/gtkprefs.c:1588
 msgid "Event"
 msgstr "Evento"
 
-#: src/gtkprefs.c:1589
+#: src/gtkprefs.c:1607
 msgid "Test"
 msgstr "Testar"
 
-#: src/gtkprefs.c:1593
+#: src/gtkprefs.c:1611
 msgid "Reset"
 msgstr "Redefinir"
 
-#: src/gtkprefs.c:1597
+#: src/gtkprefs.c:1615
 msgid "Choose..."
 msgstr "Escolher..."
 
-#: src/gtkprefs.c:1651 src/gtkstatusbox.c:295
-#: src/protocols/bonjour/bonjour.c:240 src/protocols/irc/irc.c:176
-#: src/protocols/irc/msgs.c:221 src/protocols/jabber/buddy.c:1093
-#: src/protocols/jabber/jabber.c:1055 src/protocols/msn/msn.c:577
-#: src/protocols/novell/novell.c:2825 src/protocols/novell/novell.c:2959
-#: src/protocols/novell/novell.c:3041 src/protocols/oscar/oscar.c:707
-#: src/protocols/oscar/oscar.c:6516 src/protocols/oscar/oscar.c:6585
-#: src/protocols/oscar/oscar.c:7610 src/protocols/oscar/oscar.c:7764
-#: src/protocols/sametime/sametime.c:2764 src/protocols/silc/buddy.c:1417
-#: src/protocols/silc/silc.c:52 src/protocols/yahoo/yahoo.c:3225
+#: src/gtkprefs.c:1669 src/gtkstatusbox.c:396
+#: src/protocols/bonjour/bonjour.c:252 src/protocols/irc/irc.c:175
+#: src/protocols/irc/irc.c:453 src/protocols/irc/msgs.c:221
+#: src/protocols/jabber/buddy.c:1093 src/protocols/jabber/jabber.c:1055
+#: src/protocols/msn/msn.c:577 src/protocols/novell/novell.c:2830
+#: src/protocols/novell/novell.c:2964 src/protocols/oscar/oscar.c:708
+#: src/protocols/oscar/oscar.c:6560 src/protocols/oscar/oscar.c:7581
+#: src/protocols/oscar/oscar.c:7735 src/protocols/sametime/sametime.c:3291
+#: src/protocols/silc/buddy.c:1422 src/protocols/silc/silc.c:53
+#: src/protocols/yahoo/yahoo.c:3107 src/protocols/yahoo/yahoo.c:3206
 #: src/protocols/zephyr/zephyr.c:2259 src/status.c:158
 msgid "Away"
 msgstr "Ausente"
 
-#: src/gtkprefs.c:1652
-msgid "_Queue new messages when away"
-msgstr "_Ocultar novas mensagens quando ausente"
-
-#: src/gtkprefs.c:1655
+#: src/gtkprefs.c:1671
 msgid "_Auto-reply:"
 msgstr "_Auto-resposta:"
 
-#: src/gtkprefs.c:1658
-msgid "When away"
-msgstr "Quando ausente"
-
-#: src/gtkprefs.c:1659
+#: src/gtkprefs.c:1675
 msgid "When both away and idle"
 msgstr "Quando ausente e inativo"
 
-#: src/gtkprefs.c:1662
+#: src/gtkprefs.c:1678
 msgid "_Report idle time"
 msgstr "Reportar tempo inativo"
 
-#: src/gtkprefs.c:1665
+#: src/gtkprefs.c:1681
 msgid "Auto-away"
 msgstr "Auto-away"
 
-#: src/gtkprefs.c:1666
-#, fuzzy
+#: src/gtkprefs.c:1682
 msgid "Change status when _idle"
-msgstr "Definir status de 'Ausente' _quanto inativo"
-
-#: src/gtkprefs.c:1670
-#, fuzzy
+msgstr "Definir status de 'Ausente' quanto _inativo"
+
+#: src/gtkprefs.c:1686
 msgid "_Minutes before changing status:"
-msgstr "_Minutos antes de definir o status de 'Ausente':"
-
-#: src/gtkprefs.c:1678
-#, fuzzy
+msgstr "_Minutos antes de mudar o status:"
+
+#: src/gtkprefs.c:1694
 msgid "Change _status to:"
-msgstr "Mudar endere巽o para:"
-
-#: src/gtkprefs.c:1728
+msgstr "Mudar _status para:"
+
+#: src/gtkprefs.c:1747
 msgid "Smiley Themes"
 msgstr "Temas de emoticons"
 
-#: src/gtkprefs.c:1729
+#: src/gtkprefs.c:1748
 msgid "Sounds"
 msgstr "Sons"
 
-#: src/gtkprefs.c:1730 src/protocols/silc/silc.c:1589
+#: src/gtkprefs.c:1749 src/protocols/silc/silc.c:1603
 msgid "Network"
 msgstr "Rede"
 
-#: src/gtkprefs.c:1735
+#: src/gtkprefs.c:1754
 msgid "Browser"
 msgstr "Navegador"
 
-#: src/gtkprefs.c:1739
+#: src/gtkprefs.c:1758
 msgid "Away / Idle"
 msgstr "Ausente / Inativo"
 
@@ -4239,7 +4295,7 @@
 msgid "Please enter the name of the user you wish to block."
 msgstr "Por favor digite o nome do usu叩rio que voc棚 deseja bloquear."
 
-#: src/gtkprivacy.c:632 src/gtkprivacy.c:643 src/protocols/gg/gg.c:1135
+#: src/gtkprivacy.c:632 src/gtkprivacy.c:643 src/protocols/gg/gg.c:1415
 msgid "Block"
 msgstr "Bloquear"
 
@@ -4258,14 +4314,14 @@
 #.
 #: src/gtkrequest.c:259 src/protocols/msn/dialog.c:113
 #: src/protocols/msn/msn.c:553 src/protocols/msn/msn.c:556
-#: src/protocols/novell/novell.c:1902 src/protocols/silc/buddy.c:312
+#: src/protocols/novell/novell.c:1907 src/protocols/silc/buddy.c:313
 #: src/protocols/silc/pk.c:117 src/request.h:1322
 msgid "Yes"
 msgstr "Sim"
 
 #: src/gtkrequest.c:260 src/protocols/msn/dialog.c:114
 #: src/protocols/msn/msn.c:553 src/protocols/msn/msn.c:556
-#: src/protocols/novell/novell.c:1903 src/protocols/silc/buddy.c:313
+#: src/protocols/novell/novell.c:1908 src/protocols/silc/buddy.c:314
 #: src/protocols/silc/pk.c:118 src/request.h:1322
 msgid "No"
 msgstr "N達o"
@@ -4279,19 +4335,19 @@
 msgid "Close"
 msgstr "Fechar"
 
-#: src/gtkrequest.c:1796
+#: src/gtkrequest.c:1802
 msgid "That file already exists"
 msgstr "Este arquivo j叩 existe"
 
-#: src/gtkrequest.c:1797
+#: src/gtkrequest.c:1803
 msgid "Would you like to overwrite it?"
 msgstr "Voc棚 deseja sobrescrev棚-lo?"
 
-#: src/gtkrequest.c:1839 src/gtkrequest.c:1880
+#: src/gtkrequest.c:1845 src/gtkrequest.c:1886
 msgid "Save File..."
 msgstr "Salvar arquivo..."
 
-#: src/gtkrequest.c:1840 src/gtkrequest.c:1881
+#: src/gtkrequest.c:1846 src/gtkrequest.c:1887
 msgid "Open File..."
 msgstr "Abrir arquivo..."
 
@@ -4304,74 +4360,79 @@
 msgid "_Get List"
 msgstr "Ob_ter lista"
 
-#: src/gtksavedstatuses.c:362 src/protocols/jabber/buddy.c:264
-#: src/protocols/jabber/buddy.c:805 src/protocols/novell/novell.c:1460
+#: src/gtksavedstatuses.c:429 src/protocols/jabber/buddy.c:264
+#: src/protocols/jabber/buddy.c:805 src/protocols/novell/novell.c:1465
 msgid "Title"
 msgstr "T鱈tulo"
 
-#: src/gtksavedstatuses.c:377
+#: src/gtksavedstatuses.c:444
 msgid "Type"
 msgstr "Tipo"
 
-#: src/gtksavedstatuses.c:388 src/protocols/bonjour/bonjour.c:234
-#: src/protocols/bonjour/bonjour.c:241 src/protocols/gg/gg.c:1083
-#: src/protocols/gg/gg.c:1088 src/protocols/gg/gg.c:1097
-#: src/protocols/gg/gg.c:1107 src/protocols/gg/gg.c:1112
-#: src/protocols/irc/irc.c:177 src/protocols/jabber/jabber.c:1032
-#: src/protocols/jabber/jabber.c:1040 src/protocols/jabber/jabber.c:1048
-#: src/protocols/jabber/jabber.c:1056 src/protocols/jabber/jabber.c:1064
-#: src/protocols/jabber/jabber.c:1072 src/protocols/novell/novell.c:2845
-#: src/protocols/oscar/oscar.c:7758 src/protocols/oscar/oscar.c:7765
-#: src/protocols/sametime/sametime.c:2759
-#: src/protocols/sametime/sametime.c:2765
-#: src/protocols/sametime/sametime.c:2771 src/protocols/simple/simple.c:255
-#: src/protocols/yahoo/yahoo.c:3220 src/protocols/yahoo/yahoo.c:3226
+#: src/gtksavedstatuses.c:455 src/gtksavedstatuses.c:886
+#: src/protocols/bonjour/bonjour.c:246 src/protocols/bonjour/bonjour.c:253
+#: src/protocols/gg/gg.c:1366 src/protocols/gg/gg.c:1371
+#: src/protocols/gg/gg.c:1380 src/protocols/gg/gg.c:1385
+#: src/protocols/gg/gg.c:1390 src/protocols/irc/irc.c:176
+#: src/protocols/jabber/jabber.c:1032 src/protocols/jabber/jabber.c:1040
+#: src/protocols/jabber/jabber.c:1048 src/protocols/jabber/jabber.c:1056
+#: src/protocols/jabber/jabber.c:1064 src/protocols/jabber/jabber.c:1072
+#: src/protocols/novell/novell.c:2850 src/protocols/novell/novell.c:2966
+#: src/protocols/oscar/oscar.c:7729 src/protocols/oscar/oscar.c:7736
+#: src/protocols/sametime/sametime.c:3286
+#: src/protocols/sametime/sametime.c:3292
+#: src/protocols/sametime/sametime.c:3298
+#: src/protocols/sametime/sametime.c:3371 src/protocols/simple/simple.c:255
+#: src/protocols/yahoo/yahoo.c:3201 src/protocols/yahoo/yahoo.c:3207
 #: src/protocols/zephyr/zephyr.c:2260
 msgid "Message"
 msgstr "Mensagem:"
 
-#: src/gtksavedstatuses.c:451
+#: src/gtksavedstatuses.c:518
 msgid "Saved Statuses"
 msgstr "Status salvos"
 
 #. Use button
-#. TODO: It might be better if the button said "Use" or "Activate"
-#: src/gtksavedstatuses.c:477
-#, fuzzy
+#: src/gtksavedstatuses.c:543
 msgid "_Use"
-msgstr "_Usu叩rio:"
-
-#: src/gtksavedstatuses.c:584
+msgstr "_Usar"
+
+#: src/gtksavedstatuses.c:652
 msgid "Title already in use.  You must choose a unique title."
 msgstr "T鱈tulo j叩 em uso. Voc棚 precisa escolher um t鱈tulo 炭nico."
 
-#: src/gtksavedstatuses.c:675
-msgid "Custom status"
-msgstr "Status personalizado"
-
-#: src/gtksavedstatuses.c:778 src/protocols/gg/gg.c:1064
-#: src/protocols/gg/gg.c:1069 src/protocols/jabber/buddy.c:626
-#: src/protocols/jabber/buddy.c:633 src/protocols/jabber/buddy.c:644
-#: src/protocols/jabber/jabber.c:1005 src/protocols/msn/msn.c:544
-#: src/protocols/novell/novell.c:2844 src/protocols/novell/novell.c:2848
-#: src/protocols/oscar/oscar.c:762 src/protocols/oscar/oscar.c:767
-#: src/protocols/oscar/oscar.c:769 src/protocols/yahoo/yahoo.c:2787
+#: src/gtksavedstatuses.c:845
+msgid "Different"
+msgstr "Diferente"
+
+#: src/gtksavedstatuses.c:875 src/gtksavedstatuses.c:1002
+#: src/protocols/gg/gg.c:1347 src/protocols/gg/gg.c:1352
+#: src/protocols/jabber/buddy.c:626 src/protocols/jabber/buddy.c:633
+#: src/protocols/jabber/buddy.c:644 src/protocols/jabber/jabber.c:1005
+#: src/protocols/msn/msn.c:544 src/protocols/novell/novell.c:2849
+#: src/protocols/novell/novell.c:2853 src/protocols/oscar/oscar.c:763
+#: src/protocols/oscar/oscar.c:768 src/protocols/oscar/oscar.c:770
+#: src/protocols/yahoo/yahoo.c:2803
 msgid "Status"
 msgstr "Status"
 
-#: src/gtksavedstatuses.c:797
+#: src/gtksavedstatuses.c:1021
 msgid "_Title:"
 msgstr "_T鱈tulo:"
 
-#: src/gtksavedstatuses.c:817
+#: src/gtksavedstatuses.c:1041 src/gtksavedstatuses.c:1322
 msgid "_Status:"
 msgstr "_Status:"
 
-#. Custom status message expander
-#: src/gtksavedstatuses.c:852
-#, fuzzy
+#. Different status message expander
+#: src/gtksavedstatuses.c:1076
 msgid "Use a _different status for some accounts"
-msgstr "Usar um status diferente para algumas contas"
+msgstr "Usar um status _diferente para algumas contas"
+
+#: src/gtksavedstatuses.c:1301
+#, c-format
+msgid "Status for %s"
+msgstr "Status de %s"
 
 #: src/gtksound.c:61
 msgid "Buddy logs in"
@@ -4435,99 +4496,94 @@
 "N達o foi poss鱈vel tocar o som porque o comando de som configurado n達o p担de "
 "ser executado: %s"
 
-#: src/gtkstatusbox.c:197
+#: src/gtkstatusbox.c:255
 msgid "Typing"
 msgstr "Digitando"
 
 #. connect to the server
-#: src/gtkstatusbox.c:200 src/protocols/irc/irc.c:258
-#: src/protocols/jabber/jabber.c:838 src/protocols/msn/session.c:362
-#: src/protocols/napster/napster.c:525 src/protocols/novell/novell.c:2164
-#: src/protocols/oscar/oscar.c:1816 src/protocols/simple/simple.c:1276
-#: src/protocols/yahoo/yahoo.c:2455 src/protocols/zephyr/zephyr.c:1546
+#: src/gtkstatusbox.c:258 src/protocols/irc/irc.c:257
+#: src/protocols/jabber/jabber.c:838 src/protocols/msn/session.c:349
+#: src/protocols/napster/napster.c:525 src/protocols/novell/novell.c:2169
+#: src/protocols/oscar/oscar.c:1817 src/protocols/sametime/sametime.c:3647
+#: src/protocols/simple/simple.c:1276 src/protocols/yahoo/yahoo.c:2498
+#: src/protocols/zephyr/zephyr.c:1546
 msgid "Connecting"
 msgstr "Conectando"
 
 #. hacks
-#: src/gtkstatusbox.c:294 src/protocols/bonjour/bonjour.c:233
-#: src/protocols/irc/irc.c:172 src/protocols/jabber/jabber.c:1039
+#: src/gtkstatusbox.c:395 src/protocols/bonjour/bonjour.c:245
+#: src/protocols/irc/irc.c:171 src/protocols/jabber/jabber.c:1039
 #: src/protocols/msn/msn.c:573 src/protocols/msn/state.c:29
 #: src/protocols/msn/state.c:30 src/protocols/msn/state.c:37
-#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2822
-#: src/protocols/novell/novell.c:2956 src/protocols/novell/novell.c:3039
-#: src/protocols/oscar/oscar.c:808 src/protocols/oscar/oscar.c:7757
-#: src/protocols/simple/simple.c:253 src/protocols/silc/silc.c:48
-#: src/protocols/yahoo/yahoo.c:3214 src/status.c:155
+#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2827
+#: src/protocols/novell/novell.c:2961 src/protocols/oscar/oscar.c:809
+#: src/protocols/oscar/oscar.c:7728 src/protocols/silc/silc.c:49
+#: src/protocols/simple/simple.c:253 src/status.c:155
 msgid "Available"
 msgstr "Dispon鱈vel"
 
-#.
-#. * Without this selecting Invisible as own status doesn't
-#. * work. It's not used and not needed to show status of buddies.
-#.
-#: src/gtkstatusbox.c:296 src/protocols/gg/gg.c:1096
-#: src/protocols/oscar/oscar.c:711 src/protocols/oscar/oscar.c:7771
-#: src/protocols/yahoo/yahoo.c:2633 src/protocols/yahoo/yahoo.c:3257
+#: src/gtkstatusbox.c:397 src/protocols/gg/gg.c:1380
+#: src/protocols/oscar/oscar.c:712 src/protocols/oscar/oscar.c:7742
+#: src/protocols/yahoo/yahoo.c:2646 src/protocols/yahoo/yahoo.c:3238
 msgid "Invisible"
 msgstr "Invis鱈vel"
 
-#: src/gtkstatusbox.c:297 src/protocols/bonjour/bonjour.c:228
-#: src/protocols/gg/gg.c:1082 src/protocols/irc/irc.c:168
+#: src/gtkstatusbox.c:398 src/protocols/bonjour/bonjour.c:240
+#: src/protocols/gg/gg.c:1366 src/protocols/irc/irc.c:167
 #: src/protocols/jabber/buddy.c:1087 src/protocols/jabber/jabber.c:1032
 #: src/protocols/msn/msn.c:569 src/protocols/napster/napster.c:573
-#: src/protocols/novell/novell.c:2834 src/protocols/novell/novell.c:2953
-#: src/protocols/oscar/oscar.c:769 src/protocols/oscar/oscar.c:7591
-#: src/protocols/oscar/oscar.c:7752 src/protocols/sametime/sametime.c:2754
-#: src/protocols/simple/simple.c:249 src/protocols/silc/silc.c:46
-#: src/protocols/yahoo/yahoo.c:2637 src/protocols/yahoo/yahoo.c:3211
+#: src/protocols/novell/novell.c:2839 src/protocols/novell/novell.c:2958
+#: src/protocols/oscar/oscar.c:770 src/protocols/oscar/oscar.c:7562
+#: src/protocols/oscar/oscar.c:7723 src/protocols/sametime/sametime.c:3281
+#: src/protocols/silc/silc.c:47 src/protocols/simple/simple.c:249
+#: src/protocols/yahoo/yahoo.c:2650 src/protocols/yahoo/yahoo.c:3196
 #: src/status.c:154
 msgid "Offline"
 msgstr "Desconectado"
 
-#: src/gtkstatusbox.c:299
+#: src/gtkstatusbox.c:400
 msgid "Custom..."
-msgstr ""
-
-#: src/gtkstatusbox.c:300
-#, fuzzy
+msgstr "Personalizados..."
+
+#: src/gtkstatusbox.c:401
 msgid "Saved..."
-msgstr "Salvar arquivo..."
-
-#: src/gtkstock.c:117
-msgid "_Alias"
-msgstr "_Apelido:"
+msgstr "Salvos..."
 
 #: src/gtkstock.c:119
-msgid "_Invite"
-msgstr "Conv_idar"
-
-#: src/gtkstock.c:120
-msgid "_Modify"
-msgstr "_Modificar"
+msgid "_Alias"
+msgstr "_Apelido:"
 
 #: src/gtkstock.c:121
-msgid "_Open Mail"
-msgstr "_Abrir email"
+msgid "_Invite"
+msgstr "Conv_idar"
+
+#: src/gtkstock.c:122
+msgid "_Modify"
+msgstr "_Modificar"
 
 #: src/gtkstock.c:123
+msgid "_Open Mail"
+msgstr "_Abrir email"
+
+#: src/gtkstock.c:125
 msgid "_Warn"
 msgstr "_Alertar"
 
-#: src/gtkutils.c:1393 src/gtkutils.c:1418
+#: src/gtkutils.c:1309 src/gtkutils.c:1334
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "O seguinte erro ocorreu ao carregar %s: %s"
 
-#: src/gtkutils.c:1395 src/gtkutils.c:1420
+#: src/gtkutils.c:1311 src/gtkutils.c:1336
 msgid "Failed to load image"
 msgstr "Falha ao carregar imagem"
 
-#: src/gtkutils.c:1495
+#: src/gtkutils.c:1411
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "N達o foi poss鱈vel enviar a pasta %s."
 
-#: src/gtkutils.c:1497
+#: src/gtkutils.c:1413
 msgid ""
 "Gaim cannot transfer a folder. You will need to send the files within "
 "individually"
@@ -4535,11 +4591,11 @@
 "O Gaim n達o pode transferir uma pasta. Voc棚 ter叩 que enviar os arquivos "
 "individualmente"
 
-#: src/gtkutils.c:1525 src/gtkutils.c:1534 src/gtkutils.c:1539
+#: src/gtkutils.c:1441 src/gtkutils.c:1450 src/gtkutils.c:1455
 msgid "You have dragged an image"
 msgstr "Voc棚 arrastou uma imagem"
 
-#: src/gtkutils.c:1526
+#: src/gtkutils.c:1442
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
@@ -4547,23 +4603,23 @@
 "Voc棚 pode enviar esta imagem por uma transfer棚ncia de arquivos, incluir ela "
 "nesta mensagem, ou us叩-la como o 鱈cone de amigo para este usu叩rio."
 
-#: src/gtkutils.c:1530 src/gtkutils.c:1545
+#: src/gtkutils.c:1446 src/gtkutils.c:1461
 msgid "Set as buddy icon"
 msgstr "Definir como 鱈cone de amigo"
 
-#: src/gtkutils.c:1531 src/gtkutils.c:1546
+#: src/gtkutils.c:1447 src/gtkutils.c:1462
 msgid "Send image file"
 msgstr "Enviar arquivo de imagem"
 
-#: src/gtkutils.c:1532 src/gtkutils.c:1546
+#: src/gtkutils.c:1448 src/gtkutils.c:1462
 msgid "Insert in message"
 msgstr "Inserir na mensagem"
 
-#: src/gtkutils.c:1535
+#: src/gtkutils.c:1451
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Voc棚 deseja defini-lo como o 鱈cone de amigo deste usu叩rio?"
 
-#: src/gtkutils.c:1540
+#: src/gtkutils.c:1456
 msgid ""
 "You can send this image as a file transfer or embed it into this message, or "
 "use it as the buddy icon for this user."
@@ -4571,7 +4627,7 @@
 "Voc棚 pode enviar esta imagem por uma transfer棚ncia de arquivos, inclu鱈-la "
 "nesta mensagem, ou us叩-la como o 鱈cone de amigo deste usu叩rio."
 
-#: src/gtkutils.c:1542
+#: src/gtkutils.c:1458
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -4584,11 +4640,11 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: src/gtkutils.c:1596
+#: src/gtkutils.c:1512
 msgid "Cannot send launcher"
 msgstr "Imposs鱈vel enviar atalho"
 
-#: src/gtkutils.c:1596
+#: src/gtkutils.c:1512
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -4596,6 +4652,13 @@
 "Voc棚 arrastou um atalho da 叩rea de trabalho. Provavelmente voc棚 tinha a "
 "inten巽達o de mandar o destino do atalho, ao inv辿s do atalho em si."
 
+#. Write a local message to this conversation showing that a request for a
+#. * Doodle session has been made
+#.
+#: src/gtkwhiteboard.c:344 src/protocols/yahoo/yahoo_doodle.c:96
+msgid "Sent Doodle request."
+msgstr ""
+
 #: src/log.c:129
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr ""
@@ -4642,7 +4705,7 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-RESPOSTA>: %s\n"
 
-#: src/plugin.c:331
+#: src/plugin.c:344
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -4651,39 +4714,50 @@
 "O plugin requerido %s n達o foi encontrado. Por favor instale esse plugin e "
 "tente novamente."
 
-#: src/plugin.c:336 src/plugin.c:364
+#: src/plugin.c:349 src/plugin.c:377
 msgid "Gaim was unable to load your plugin."
 msgstr "O Gaim n達o conseguiu carregar seu plugin."
 
-#: src/plugin.c:360
+#: src/plugin.c:373
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "O plugin requerido %s n達o p担de ser carregado."
 
-#: src/protocols/bonjour/bonjour.c:298 src/protocols/msn/msn.c:546
-#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2831
-#: src/protocols/oscar/oscar.c:5064 src/protocols/yahoo/yahoo.c:2635
+#. Send a message about the connection error
+#: src/protocols/bonjour/bonjour.c:101
+msgid "Unable to listen for incoming IM connections\n"
+msgstr "Imposs鱈vel escutar por novas conex探es de mensagem instant但nea\n"
+
+#: src/protocols/bonjour/bonjour.c:136
+msgid ""
+"Unable to establish connection with the local mDNS server.  Is it running?"
+msgstr ""
+"Imposs鱈vel estabelecer conex達o com o servidor mDNS local. Ele est叩 rodando?"
+
+#: src/protocols/bonjour/bonjour.c:317 src/protocols/msn/msn.c:546
+#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2836
+#: src/protocols/oscar/oscar.c:5057 src/protocols/yahoo/yahoo.c:2648
 #: src/protocols/yahoo/yahoo_profile.c:660
 msgid "Idle"
 msgstr "Inativo"
 
-#: src/protocols/bonjour/bonjour.c:303
-#, fuzzy, c-format
+#: src/protocols/bonjour/bonjour.c:322
+#, c-format
 msgid ""
 "\n"
 "<b>Status:</b> %s"
 msgstr ""
 "\n"
-"<b>Status</b>: Incr鱈vel"
-
-#: src/protocols/bonjour/bonjour.c:305
-#, fuzzy, c-format
+"<b>Status:</b> %s"
+
+#: src/protocols/bonjour/bonjour.c:324
+#, c-format
 msgid ""
 "\n"
 "<b>Message:</b> %s"
 msgstr ""
 "\n"
-"<b>%s:</b> %s"
+"<b>Mensagem:</b> %s"
 
 #. *< type
 #. *< ui_requirement
@@ -4695,233 +4769,241 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/bonjour/bonjour.c:388 src/protocols/bonjour/bonjour.c:390
-#, fuzzy
+#: src/protocols/bonjour/bonjour.c:417 src/protocols/bonjour/bonjour.c:419
 msgid "Bonjour Protocol Plugin"
-msgstr "Plugin do protocolo Yahoo"
+msgstr "Plugin do protocolo Bonjour"
+
+#: src/protocols/bonjour/bonjour.c:451 src/protocols/bonjour/bonjour.c:508
+msgid "Gaim User"
+msgstr "Usu叩rio do Gaim"
 
 #. Creating the user splits
-#: src/protocols/bonjour/bonjour.c:417
-#, fuzzy
+#: src/protocols/bonjour/bonjour.c:546
 msgid "Host name"
-msgstr "Host fora do ar"
+msgstr "Nome do host"
 
 #. Creating the options for the protocol
-#: src/protocols/bonjour/bonjour.c:421 src/protocols/irc/irc.c:822
-#: src/protocols/msn/msn.c:1968 src/protocols/napster/napster.c:712
-#: src/protocols/silc/silc.c:1597
+#. port to connect to
+#: src/protocols/bonjour/bonjour.c:550 src/protocols/irc/irc.c:813
+#: src/protocols/msn/msn.c:1952 src/protocols/napster/napster.c:712
+#: src/protocols/sametime/sametime.c:5658 src/protocols/silc/silc.c:1611
 msgid "Port"
 msgstr "Porta"
 
-#: src/protocols/bonjour/bonjour.c:424 src/protocols/gg/gg.c:405
-#, fuzzy
+#: src/protocols/bonjour/bonjour.c:553 src/protocols/gg/gg.c:567
 msgid "First name"
-msgstr "Nome:"
-
-#: src/protocols/bonjour/bonjour.c:427 src/protocols/gg/gg.c:401
-#, fuzzy
+msgstr "Nome"
+
+#: src/protocols/bonjour/bonjour.c:556 src/protocols/gg/gg.c:562
 msgid "Last name"
-msgstr "Sobrenome:"
-
-#: src/protocols/bonjour/bonjour.c:430 src/protocols/jabber/buddy.c:261
+msgstr "Sobrenome"
+
+#: src/protocols/bonjour/bonjour.c:559 src/protocols/jabber/buddy.c:261
 #: src/protocols/jabber/buddy.c:772 src/protocols/jabber/buddy.c:780
-#: src/protocols/silc/silc.c:661 src/protocols/silc/util.c:511
+#: src/protocols/silc/silc.c:662 src/protocols/silc/util.c:511
 #: src/protocols/yahoo/yahoo_profile.c:995
 msgid "Email"
 msgstr "Email"
 
 #: src/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
-msgstr ""
-
-#: src/protocols/gg/gg.c:136 src/protocols/gg/gg.c:155
-#, fuzzy
+msgstr "Bonjour"
+
+#: src/protocols/gg/gg.c:89 src/protocols/gg/gg.c:111
+#: src/protocols/gg/gg.c:146
+msgid "Token Error"
+msgstr "Erro de token"
+
+#: src/protocols/gg/gg.c:90 src/protocols/gg/gg.c:112
+#: src/protocols/gg/gg.c:147
+msgid "Unable to fetch the token.\n"
+msgstr "Imposs鱈vel obter o token.\n"
+
+#: src/protocols/gg/gg.c:235 src/protocols/gg/gg.c:254
 msgid "Save Buddylist..."
-msgstr "Enviar lista de amigos"
-
-#: src/protocols/gg/gg.c:137
+msgstr "Salvar lista de amigos..."
+
+#: src/protocols/gg/gg.c:236
 msgid "Your buddylist is empty, nothing was written to the file."
-msgstr ""
-
-#: src/protocols/gg/gg.c:143 src/protocols/gg/gg.c:145
-#: src/protocols/gg/gg.c:176
-#, fuzzy
+msgstr "Sua lista de amigos est叩 vazia; nada foi escrito no arquivo."
+
+#: src/protocols/gg/gg.c:242 src/protocols/gg/gg.c:244
 msgid "Couldn't open file"
-msgstr "N達o foi poss鱈vel enviar o arquivo"
-
-#: src/protocols/gg/gg.c:156
-#, fuzzy
+msgstr "N達o foi poss鱈vel abrir o arquivo"
+
+#: src/protocols/gg/gg.c:255
 msgid "Buddylist saved successfully!"
-msgstr "Senha alterada com sucesso"
-
-#: src/protocols/gg/gg.c:178
-#, fuzzy
-msgid "Could't open file"
-msgstr "N達o foi poss鱈vel enviar o arquivo"
-
-#: src/protocols/gg/gg.c:199
-#, fuzzy
+msgstr "Lista de amigos salva com sucesso!"
+
+#: src/protocols/gg/gg.c:273 src/protocols/gg/gg.c:274
+msgid "Couldn't load buddylist"
+msgstr "N達o foi possivel carregar lista de amigos"
+
+#: src/protocols/gg/gg.c:290
 msgid "Load Buddylist..."
-msgstr "_Apelidar amigo..."
-
-#: src/protocols/gg/gg.c:200
-#, fuzzy
+msgstr "Carregar lista de amigos..."
+
+#: src/protocols/gg/gg.c:291
 msgid "Buddylist loaded successfully!"
-msgstr "Senha alterada com sucesso"
-
-#: src/protocols/gg/gg.c:211
-#, fuzzy
+msgstr "Lista de amigos carregada com sucesso!"
+
+#: src/protocols/gg/gg.c:302
 msgid "Save buddylist..."
-msgstr "Lista de amigos"
-
-#: src/protocols/gg/gg.c:254
+msgstr "Salvar lista de amigos..."
+
+#: src/protocols/gg/gg.c:346
 msgid "Fill in the registration fields."
-msgstr ""
-
-#: src/protocols/gg/gg.c:259
-#, fuzzy
+msgstr "Preencha os campos do registro."
+
+#: src/protocols/gg/gg.c:351
 msgid "Passwords do not match."
-msgstr "Senhas novas n達o conferem."
-
-#: src/protocols/gg/gg.c:266
-#, fuzzy
+msgstr "As senhsa n達o conferem."
+
+#: src/protocols/gg/gg.c:360
 msgid "Unable to register new account. Error occurred.\n"
-msgstr "Imposs鱈vel criar nova conex達o."
-
-#: src/protocols/gg/gg.c:279
+msgstr "Imposs鱈vel registrar a nova conta. Ocorreu um erro.\n"
+
+#: src/protocols/gg/gg.c:373
 msgid "New Gadu-Gadu Account Registered"
-msgstr ""
-
-#: src/protocols/gg/gg.c:280
-#, fuzzy
+msgstr "Nova conta do Gadu-Gadu registrada"
+
+#: src/protocols/gg/gg.c:374
 msgid "Registration completed successfully!"
-msgstr "Registro efetuado com sucesso"
-
-#: src/protocols/gg/gg.c:409 src/protocols/gg/gg.c:1665
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:698
-#: src/protocols/jabber/buddy.c:1341 src/protocols/jabber/jabber.c:648
-#: src/protocols/msn/msn.c:1394 src/protocols/silc/buddy.c:1480
-#: src/protocols/silc/ops.c:822 src/protocols/silc/ops.c:965
-#: src/protocols/silc/ops.c:1114 src/protocols/yahoo/yahoo_profile.c:1000
-msgid "Nickname"
-msgstr "Apelido"
-
-#: src/protocols/gg/gg.c:413 src/protocols/jabber/jabber.c:668
-#: src/protocols/oscar/oscar.c:6006 src/protocols/oscar/oscar.c:6014
-msgid "City"
-msgstr "Cidade"
-
-#: src/protocols/gg/gg.c:417
-msgid "Year of birth"
-msgstr ""
-
-#: src/protocols/gg/gg.c:426
-#, fuzzy
-msgid "Only online"
-msgstr "Conectado"
-
-#: src/protocols/gg/gg.c:430 src/protocols/gg/gg.c:431
-#: src/protocols/gg/gg.c:1510
-#, fuzzy
-msgid "Find buddies"
-msgstr "Amigos"
-
-#: src/protocols/gg/gg.c:432
-#, fuzzy
-msgid "Please, enter your search criteria below"
-msgstr "Favor digitar sua nova senha"
-
-#: src/protocols/gg/gg.c:465
-msgid "Fill in the fields."
-msgstr ""
-
-#: src/protocols/gg/gg.c:476
-msgid "Your current password is different from the one that you specified."
-msgstr ""
-
-#: src/protocols/gg/gg.c:491
-#, fuzzy
-msgid "Unable to change password. Error occured.\n"
-msgstr "Imposs鱈vel alterar a senha do Gadu-Gadu"
-
-#: src/protocols/gg/gg.c:500
-#, fuzzy
-msgid "Change password for the Gadu-Gadu account"
-msgstr "Mudar senha para %s"
-
-#: src/protocols/gg/gg.c:501
-#, fuzzy
-msgid "Password was changed successfully!"
-msgstr "Senha alterada com sucesso"
-
-#: src/protocols/gg/gg.c:535
-#, fuzzy
-msgid "Token Error"
-msgstr "Erro desconhecido"
-
-#: src/protocols/gg/gg.c:536
-#, fuzzy
-msgid "Unable to fetch the token.\n"
-msgstr "Imposs鱈vel obter lista de salas."
-
-#: src/protocols/gg/gg.c:551
-#, fuzzy
-msgid "Current password"
-msgstr "Senha incorreta."
-
-#: src/protocols/gg/gg.c:555 src/protocols/gg/gg.c:1476
+msgstr "Registro efetuado com sucesso!"
+
+#: src/protocols/gg/gg.c:434
+msgid "e-Mail"
+msgstr "e-Mail"
+
+#: src/protocols/gg/gg.c:439 src/protocols/gg/gg.c:710
 #: src/protocols/jabber/jabber.c:632 src/protocols/jabber/jabber.c:1150
 msgid "Password"
 msgstr "Senha"
 
-#: src/protocols/gg/gg.c:559 src/protocols/gg/gg.c:1480
-#, fuzzy
+#: src/protocols/gg/gg.c:444 src/protocols/gg/gg.c:715
 msgid "Password (retype)"
-msgstr "Senha enviada"
-
-#: src/protocols/gg/gg.c:563 src/protocols/gg/gg.c:1484
-#, fuzzy
+msgstr "Senha (redigitar)"
+
+#: src/protocols/gg/gg.c:449 src/protocols/gg/gg.c:720
 msgid "Enter current token"
-msgstr "%s n達o est叩 conectado no momento."
-
-#. original size: 60x24
-#: src/protocols/gg/gg.c:568 src/protocols/gg/gg.c:1489
-#, fuzzy
+msgstr "Digite o token atual"
+
+#: src/protocols/gg/gg.c:455 src/protocols/gg/gg.c:726
 msgid "Current token"
-msgstr "Atualmente em"
-
-#: src/protocols/gg/gg.c:574
-#, fuzzy
+msgstr "Token atual"
+
+#: src/protocols/gg/gg.c:459 src/protocols/gg/gg.c:460
+msgid "Register New Gadu-Gadu Account"
+msgstr "Registrar nova conta do Gadu-Gadu"
+
+#: src/protocols/gg/gg.c:461
+msgid "Please, fill in the following fields"
+msgstr "Por favor, preencha os seguintes campos"
+
+#: src/protocols/gg/gg.c:572 src/protocols/gg/gg.c:1907
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:698
+#: src/protocols/jabber/buddy.c:1341 src/protocols/jabber/jabber.c:648
+#: src/protocols/msn/msn.c:1378 src/protocols/silc/buddy.c:1485
+#: src/protocols/silc/ops.c:855 src/protocols/silc/ops.c:998
+#: src/protocols/silc/ops.c:1147 src/protocols/yahoo/yahoo_profile.c:1000
+msgid "Nickname"
+msgstr "Apelido"
+
+#: src/protocols/gg/gg.c:577 src/protocols/jabber/jabber.c:668
+#: src/protocols/oscar/oscar.c:6000 src/protocols/oscar/oscar.c:6008
+msgid "City"
+msgstr "Cidade"
+
+#: src/protocols/gg/gg.c:582
+msgid "Year of birth"
+msgstr "Ano de nascimento"
+
+#: src/protocols/gg/gg.c:585 src/protocols/msn/msn.c:1537
+#: src/protocols/oscar/oscar.c:5973 src/protocols/yahoo/yahoo_profile.c:1025
+msgid "Gender"
+msgstr "Sexo"
+
+#: src/protocols/gg/gg.c:586
+msgid "Male or female"
+msgstr "Homem ou mulher"
+
+#: src/protocols/gg/gg.c:587 src/protocols/oscar/oscar.c:5973
+msgid "Male"
+msgstr "Masculino"
+
+#: src/protocols/gg/gg.c:588 src/protocols/oscar/oscar.c:5973
+msgid "Female"
+msgstr "Feminino"
+
+#: src/protocols/gg/gg.c:592
+msgid "Only online"
+msgstr "Apenas conectado"
+
+#: src/protocols/gg/gg.c:596 src/protocols/gg/gg.c:597
+#: src/protocols/gg/gg.c:1745
+msgid "Find buddies"
+msgstr "Encontrar amigos"
+
+#: src/protocols/gg/gg.c:598
+msgid "Please, enter your search criteria below"
+msgstr "Por favor, digite o crit辿rio de busca abaixo"
+
+#: src/protocols/gg/gg.c:635
+msgid "Fill in the fields."
+msgstr "Preencha os campos."
+
+#: src/protocols/gg/gg.c:647
+msgid "Your current password is different from the one that you specified."
+msgstr "Sua senha atual 辿 diferente da que voc棚 especificou."
+
+#: src/protocols/gg/gg.c:662
+msgid "Unable to change password. Error occured.\n"
+msgstr "Imposs鱈vel alterar a senha. Ocorreu um erro.\n"
+
+#: src/protocols/gg/gg.c:671
+msgid "Change password for the Gadu-Gadu account"
+msgstr "Mudar senha da conta do Gadu-Gadu"
+
+#: src/protocols/gg/gg.c:672
+msgid "Password was changed successfully!"
+msgstr "A senha foi alterada com sucesso!"
+
+#: src/protocols/gg/gg.c:705
+msgid "Current password"
+msgstr "Senha atual"
+
+#: src/protocols/gg/gg.c:730
 msgid "Please, enter your current password and your new password for UIN: "
-msgstr "Favor digitar sua senha atual e sua nova senha."
-
-#: src/protocols/gg/gg.c:578 src/protocols/gg/gg.c:579
-#, fuzzy
+msgstr "Por favor, digite sua senha atual e sua nova senha para o UIN: "
+
+#: src/protocols/gg/gg.c:734 src/protocols/gg/gg.c:735
 msgid "Change Gadu-Gadu Password"
-msgstr "Imposs鱈vel alterar a senha do Gadu-Gadu"
-
-#: src/protocols/gg/gg.c:649
-#, fuzzy, c-format
+msgstr "Mudar a senha do Gadu-Gadu"
+
+#: src/protocols/gg/gg.c:819
+#, c-format
 msgid "Select a chat for buddy: %s"
-msgstr "Selecionar fonte para %s"
-
-#: src/protocols/gg/gg.c:651 src/protocols/gg/gg.c:652
-#, fuzzy
+msgstr "Selecione um bate-papo para o amigo: %s"
+
+#: src/protocols/gg/gg.c:822 src/protocols/gg/gg.c:823
 msgid "Add to chat..."
-msgstr "Adicionar um c_hat"
-
-#: src/protocols/gg/gg.c:812
+msgstr "Adicionar ao bate-papo..."
+
+#: src/protocols/gg/gg.c:991
+msgid "Gadu-Gadu Public Directory"
+msgstr "Lista p炭blica do Gadu-Gadu"
+
+#: src/protocols/gg/gg.c:992
+msgid "Search results"
+msgstr "Resultados da procura"
+
+#: src/protocols/gg/gg.c:1071 src/protocols/gg/gg.c:1213
 msgid "Unable to read socket"
 msgstr "Imposs鱈vel ler do socket"
 
-#: src/protocols/gg/gg.c:959
-msgid "Gadu-Gadu Public Directory"
-msgstr ""
-
-#: src/protocols/gg/gg.c:960
-#, fuzzy
-msgid "Search results"
-msgstr "Resultados da procura"
+#: src/protocols/gg/gg.c:1247 src/protocols/gg/gg.c:1465
+msgid "Connection failed."
+msgstr "Falha na conex達o."
 
 #. zephyr has several exposures
 #. NONE (where you are hidden, and zephyrs to you are in practice silently dropped -- yes this is wrong)
@@ -4936,109 +5018,71 @@
 #.
 #. Away won't change their exposure but will set an auto away message (for IMs only)
 #.
-#: src/protocols/gg/gg.c:1087 src/protocols/jabber/buddy.c:1089
-#: src/protocols/napster/napster.c:578 src/protocols/oscar/oscar.c:713
-#: src/protocols/yahoo/yahoo.c:2639 src/protocols/zephyr/zephyr.c:2252
+#: src/protocols/gg/gg.c:1371 src/protocols/jabber/buddy.c:1089
+#: src/protocols/napster/napster.c:578 src/protocols/oscar/oscar.c:714
+#: src/protocols/yahoo/yahoo.c:2652 src/protocols/zephyr/zephyr.c:2252
 msgid "Online"
 msgstr "Conectado"
 
-#. type = gaim_status_type_new_with_attrs(GAIM_STATUS_UNAVAILABLE, "not-available", "Not Available",
-#. TRUE, TRUE, FALSE, "message", _("Message"),
-#. gaim_value_new(GAIM_TYPE_STRING), NULL);
-#. types = g_list_append(types, type);
-#: src/protocols/gg/gg.c:1106 src/protocols/msn/msn.c:585
-#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2828
-#: src/protocols/novell/novell.c:2962 src/protocols/novell/novell.c:3044
-#: src/protocols/silc/buddy.c:1421 src/protocols/silc/silc.c:54
-#: src/protocols/yahoo/yahoo.c:2617 src/protocols/yahoo/yahoo.c:3233
+#: src/protocols/gg/gg.c:1385 src/protocols/msn/msn.c:585
+#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2833
+#: src/protocols/novell/novell.c:2970 src/protocols/silc/buddy.c:1426
+#: src/protocols/silc/silc.c:55 src/protocols/yahoo/yahoo.c:2630
+#: src/protocols/yahoo/yahoo.c:3214
 msgid "Busy"
 msgstr "Ocupado"
 
-#: src/protocols/gg/gg.c:1111 src/protocols/msn/msn.c:554
+#: src/protocols/gg/gg.c:1390 src/protocols/msn/msn.c:554
 msgid "Blocked"
 msgstr "Bloqueado"
 
-#: src/protocols/gg/gg.c:1129
-#, fuzzy
+#: src/protocols/gg/gg.c:1407
 msgid "Add to chat"
-msgstr "Adicionar bate-papo"
-
-#: src/protocols/gg/gg.c:1133
-#, fuzzy
+msgstr "Adicionar ao bate-papo"
+
+#: src/protocols/gg/gg.c:1412
 msgid "Unblock"
-msgstr "Bloquear"
-
-#: src/protocols/gg/gg.c:1149
-#, fuzzy
+msgstr "Desbloquear"
+
+#: src/protocols/gg/gg.c:1431
 msgid "Chat _name:"
-msgstr "Sobrenome:"
-
-#: src/protocols/gg/gg.c:1183
-#, fuzzy
-msgid "Connection failed."
-msgstr "Falha na conex達o"
-
-#: src/protocols/gg/gg.c:1357
-#, fuzzy
+msgstr "_Nome do bate-papo:"
+
+#: src/protocols/gg/gg.c:1641
 msgid "Chat error"
-msgstr "Erro de leitura"
-
-#: src/protocols/gg/gg.c:1358
-#, fuzzy
+msgstr "Erro no bate-papo"
+
+#: src/protocols/gg/gg.c:1642
 msgid "This chat name is already in use"
-msgstr "Este arquivo j叩 existe"
-
-#: src/protocols/gg/gg.c:1435
-#, fuzzy
+msgstr "Este nome de bate-papo j叩 est叩 em uso"
+
+#: src/protocols/gg/gg.c:1722
 msgid "Not connected to the server."
-msgstr "Voc棚 foi desconectado do servidor."
-
-#: src/protocols/gg/gg.c:1456
-msgid "Token Error: Unable to fetch the token.\n"
-msgstr ""
-
-#: src/protocols/gg/gg.c:1472
-#, fuzzy
-msgid "e-Mail"
-msgstr "Email"
-
-#: src/protocols/gg/gg.c:1495 src/protocols/gg/gg.c:1496
-#, fuzzy
-msgid "Register New Gadu-Gadu Account"
-msgstr "Registrar nova conta do Jabber"
-
-#: src/protocols/gg/gg.c:1497
-msgid "Please, fill in the following fields"
-msgstr ""
-
-#: src/protocols/gg/gg.c:1515
-#, fuzzy
+msgstr "N達o conectado ao servidor."
+
+#: src/protocols/gg/gg.c:1751
 msgid "Change password"
 msgstr "Alterar senha"
 
-#: src/protocols/gg/gg.c:1520
-#, fuzzy
+#: src/protocols/gg/gg.c:1757
 msgid "Upload buddylist to Server"
-msgstr "Exportar lista de amigos para o servidor"
-
-#: src/protocols/gg/gg.c:1523
-#, fuzzy
+msgstr "Enviar lista de amigos para o servidor"
+
+#: src/protocols/gg/gg.c:1761
 msgid "Download buddylist from Server"
-msgstr "Remover lista de amigos do servidor"
-
-#: src/protocols/gg/gg.c:1526
-#, fuzzy
+msgstr "Baixar lista de amigos do servidor"
+
+#: src/protocols/gg/gg.c:1765
 msgid "Delete buddylist from Server"
 msgstr "Remover lista de amigos do servidor"
 
-#: src/protocols/gg/gg.c:1529
+#: src/protocols/gg/gg.c:1769
 msgid "Save buddylist to file"
-msgstr ""
-
-#: src/protocols/gg/gg.c:1532
-#, fuzzy
+msgstr "Salvar a lista de amigos em um arquivo"
+
+#: src/protocols/gg/gg.c:1773
 msgid "Load buddylist from file"
-msgstr "Importar lista de amigos do servidor"
+msgstr "Carregar lista de amigos de um arquivo"
 
 #. magic
 #. major_version
@@ -5051,33 +5095,32 @@
 #. id
 #. name
 #. version
-#: src/protocols/gg/gg.c:1617
+#: src/protocols/gg/gg.c:1859
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Plugin do protocolo Gadu-Gadu"
 
 #. summary
-#: src/protocols/gg/gg.c:1618
+#: src/protocols/gg/gg.c:1860
 msgid "Polish popular IM"
-msgstr ""
-
-#: src/protocols/gg/gg.c:1665
-#, fuzzy
+msgstr "Servi巽o de mensagens instant但neas polon棚s muito popular por l叩"
+
+#: src/protocols/gg/gg.c:1908
 msgid "Gadu-Gadu User"
-msgstr "Mecanismo de busca do Gadu-Gadu"
-
-#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1313
+msgstr "Usu叩rio do Gadu-Gadu"
+
+#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1314
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Comando desconhecido: %s"
 
-#: src/protocols/irc/cmds.c:468 src/protocols/jabber/chat.c:592
-#: src/protocols/silc/silc.c:1021
+#: src/protocols/irc/cmds.c:485 src/protocols/jabber/chat.c:592
+#: src/protocols/silc/silc.c:1022
 #, c-format
 msgid "current topic is: %s"
 msgstr "O t坦pico atual 辿: %s"
 
-#: src/protocols/irc/cmds.c:472 src/protocols/jabber/chat.c:596
-#: src/protocols/silc/silc.c:1025
+#: src/protocols/irc/cmds.c:489 src/protocols/jabber/chat.c:596
+#: src/protocols/silc/silc.c:1026
 msgid "No topic is set"
 msgstr "Nenhum t坦pico foi definido"
 
@@ -5091,78 +5134,79 @@
 msgid "Gaim could not open a listening port."
 msgstr "O Gaim n達o p担de abrir uma porta para escuta."
 
-#: src/protocols/irc/irc.c:79
+#: src/protocols/irc/irc.c:78
 msgid "Error displaying MOTD"
 msgstr "Erro ao exibir mensagem do dia (MOTD)"
 
-#: src/protocols/irc/irc.c:79
+#: src/protocols/irc/irc.c:78
 msgid "No MOTD available"
 msgstr "N達o h叩 mensagem do dia (MOTD) dispon鱈vel"
 
-#: src/protocols/irc/irc.c:80
+#: src/protocols/irc/irc.c:79
 msgid "There is no MOTD associated with this connection."
 msgstr "N達o h叩 mensagem do dia (MOTD) associada com esta conex達o."
 
-#: src/protocols/irc/irc.c:83
+#: src/protocols/irc/irc.c:82
 #, c-format
 msgid "MOTD for %s"
 msgstr "Mensagem do dia (MOTD) para %s"
 
-#: src/protocols/irc/irc.c:103 src/protocols/irc/irc.c:522
-#: src/protocols/irc/irc.c:544
+#: src/protocols/irc/irc.c:102 src/protocols/irc/irc.c:523
+#: src/protocols/irc/irc.c:545
 msgid "Server has disconnected"
 msgstr "O servidor desconectou"
 
-#: src/protocols/irc/irc.c:188
+#: src/protocols/irc/irc.c:187
 msgid "View MOTD"
 msgstr "Ver mensagem do dia (MOTD)"
 
-#: src/protocols/irc/irc.c:200 src/protocols/silc/chat.c:32
+#: src/protocols/irc/irc.c:199 src/protocols/silc/chat.c:33
 msgid "_Channel:"
 msgstr "_Canal:"
 
-#: src/protocols/irc/irc.c:206 src/protocols/jabber/chat.c:59
+#: src/protocols/irc/irc.c:205 src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "_Senha:"
 
-#: src/protocols/irc/irc.c:238
+#: src/protocols/irc/irc.c:237
 msgid "IRC nicks may not contain whitespace"
 msgstr "Apelidos do IRC n達o podem conter espa巽os"
 
-#: src/protocols/irc/irc.c:266 src/protocols/jabber/jabber.c:433
+#: src/protocols/irc/irc.c:265 src/protocols/jabber/jabber.c:433
 #: src/protocols/jabber/jabber.c:770
 msgid "SSL support unavailable"
 msgstr "Suporte a SSL indispon鱈vel"
 
-#: src/protocols/irc/irc.c:277 src/protocols/simple/simple.c:383
+#: src/protocols/irc/irc.c:276 src/protocols/simple/simple.c:383
 #: src/protocols/simple/simple.c:1219
 msgid "Couldn't create socket"
 msgstr "Imposs鱈vel criar socket"
 
-#: src/protocols/irc/irc.c:348 src/protocols/jabber/jabber.c:306
-#: src/protocols/oscar/oscar.c:1744 src/protocols/oscar/oscar.c:1812
+#: src/protocols/irc/irc.c:347 src/protocols/jabber/jabber.c:306
+#: src/protocols/oscar/oscar.c:1745 src/protocols/oscar/oscar.c:1813
 msgid "Couldn't connect to host"
 msgstr "N達o foi poss鱈vel conectar ao host"
 
-#: src/protocols/irc/irc.c:373 src/protocols/jabber/jabber.c:333
+#: src/protocols/irc/irc.c:372 src/protocols/jabber/jabber.c:333
 msgid "Connection Failed"
 msgstr "Falha na conex達o"
 
-#: src/protocols/irc/irc.c:376 src/protocols/jabber/jabber.c:336
+#: src/protocols/irc/irc.c:375 src/protocols/jabber/jabber.c:336
 msgid "SSL Handshake Failed"
 msgstr "Falha na negocia巽達o SSL"
 
-#: src/protocols/irc/irc.c:519 src/protocols/irc/irc.c:541
+#: src/protocols/irc/irc.c:520 src/protocols/irc/irc.c:542
 msgid "Read error"
 msgstr "Erro de leitura"
 
-#: src/protocols/irc/irc.c:690 src/protocols/silc/chat.c:1388
+#: src/protocols/irc/irc.c:681 src/protocols/silc/chat.c:1412
 #: src/protocols/yahoo/yahoochat.c:1376
 msgid "Users"
 msgstr "Usu叩rios"
 
-#: src/protocols/irc/irc.c:693 src/protocols/silc/chat.c:1391
-#: src/protocols/silc/ops.c:1166 src/protocols/yahoo/yahoochat.c:1385
+#: src/protocols/irc/irc.c:684 src/protocols/sametime/sametime.c:3368
+#: src/protocols/silc/chat.c:1415 src/protocols/silc/ops.c:1199
+#: src/protocols/yahoo/yahoochat.c:1385
 msgid "Topic"
 msgstr "T坦pico"
 
@@ -5174,34 +5218,35 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:799
+#: src/protocols/irc/irc.c:790
 msgid "IRC Protocol Plugin"
 msgstr "Plugin do protocolo IRC"
 
 #. *  summary
-#: src/protocols/irc/irc.c:800
+#: src/protocols/irc/irc.c:791
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "O plugin do protocolo IRC que 辿 menos ruim"
 
-#: src/protocols/irc/irc.c:819 src/protocols/irc/msgs.c:233
+#. host to connect to
+#: src/protocols/irc/irc.c:810 src/protocols/irc/msgs.c:233
 #: src/protocols/jabber/jabber.c:1708 src/protocols/napster/napster.c:707
-#: src/protocols/simple/simple.c:1428 src/protocols/silc/ops.c:1028
-#: src/protocols/silc/ops.c:1130
+#: src/protocols/sametime/sametime.c:5653 src/protocols/silc/ops.c:1061
+#: src/protocols/silc/ops.c:1163 src/protocols/simple/simple.c:1428
 msgid "Server"
 msgstr "Servidor"
 
-#: src/protocols/irc/irc.c:825
+#: src/protocols/irc/irc.c:816
 msgid "Encodings"
 msgstr "Codifica巽探es"
 
-#: src/protocols/irc/irc.c:828 src/protocols/irc/msgs.c:227
-#: src/protocols/jabber/jabber.c:628 src/protocols/silc/buddy.c:1483
-#: src/protocols/silc/ops.c:975 src/protocols/silc/ops.c:977
-#: src/protocols/silc/ops.c:1124 src/protocols/silc/ops.c:1126
+#: src/protocols/irc/irc.c:819 src/protocols/irc/msgs.c:227
+#: src/protocols/jabber/jabber.c:628 src/protocols/silc/buddy.c:1488
+#: src/protocols/silc/ops.c:1008 src/protocols/silc/ops.c:1010
+#: src/protocols/silc/ops.c:1157 src/protocols/silc/ops.c:1159
 msgid "Username"
 msgstr "Nome do usu叩rio"
 
-#: src/protocols/irc/irc.c:831
+#: src/protocols/irc/irc.c:822
 msgid "Real name"
 msgstr "Nome real"
 
@@ -5209,7 +5254,7 @@
 #. option = gaim_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: src/protocols/irc/irc.c:839
+#: src/protocols/irc/irc.c:830
 msgid "Use SSL"
 msgstr "Usar SSL"
 
@@ -5237,8 +5282,8 @@
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: src/protocols/irc/msgs.c:213 src/protocols/oscar/oscar.c:5952
-#: src/protocols/silc/ops.c:1198
+#: src/protocols/irc/msgs.c:213 src/protocols/oscar/oscar.c:5946
+#: src/protocols/silc/ops.c:1231
 msgid "Nick"
 msgstr "Apelido"
 
@@ -5257,12 +5302,12 @@
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:228 src/protocols/silc/ops.c:969
-#: src/protocols/silc/ops.c:1118 src/protocols/yahoo/yahoo_profile.c:1005
+#: src/protocols/irc/msgs.c:228 src/protocols/silc/ops.c:1002
+#: src/protocols/silc/ops.c:1151 src/protocols/yahoo/yahoo_profile.c:1005
 msgid "Realname"
 msgstr "Nome real"
 
-#: src/protocols/irc/msgs.c:239 src/protocols/silc/ops.c:1041
+#: src/protocols/irc/msgs.c:239 src/protocols/silc/ops.c:1074
 msgid "Currently on"
 msgstr "Atualmente em"
 
@@ -5307,60 +5352,60 @@
 msgid "Users on %s: %s"
 msgstr "Usu叩rios em %s: %s"
 
-#: src/protocols/irc/msgs.c:482
+#: src/protocols/irc/msgs.c:491
 msgid "Time Response"
 msgstr "Tempo de resposta"
 
-#: src/protocols/irc/msgs.c:483
+#: src/protocols/irc/msgs.c:492
 msgid "The IRC server's local time is:"
 msgstr "A hora local do servidor IRC 辿:"
 
-#: src/protocols/irc/msgs.c:494
+#: src/protocols/irc/msgs.c:503
 msgid "No such channel"
 msgstr "Canal inexistente"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:505
+#: src/protocols/irc/msgs.c:514
 msgid "no such channel"
 msgstr "Canal inexistente"
 
-#: src/protocols/irc/msgs.c:508
+#: src/protocols/irc/msgs.c:517
 msgid "User is not logged in"
 msgstr "O usu叩rio est叩 desconectado"
 
-#: src/protocols/irc/msgs.c:513
+#: src/protocols/irc/msgs.c:522
 msgid "No such nick or channel"
 msgstr "Apelido ou canal inexistente"
 
-#: src/protocols/irc/msgs.c:533
+#: src/protocols/irc/msgs.c:542
 msgid "Could not send"
 msgstr "N達o foi poss鱈vel enviar"
 
-#: src/protocols/irc/msgs.c:589
+#: src/protocols/irc/msgs.c:598
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "� necess叩rio um convite para entrar em %s."
 
-#: src/protocols/irc/msgs.c:590
+#: src/protocols/irc/msgs.c:599
 msgid "Invitation only"
 msgstr "Apenas convidados"
 
-#: src/protocols/irc/msgs.c:692
+#: src/protocols/irc/msgs.c:701
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Voc棚 foi expulso por %s: (%s)"
 
-#: src/protocols/irc/msgs.c:697
+#: src/protocols/irc/msgs.c:706
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Chutado por %s (%s)"
 
-#: src/protocols/irc/msgs.c:721
+#: src/protocols/irc/msgs.c:730
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "Modo (%s %s) por %s"
 
-#: src/protocols/irc/msgs.c:805
+#: src/protocols/irc/msgs.c:814
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -5368,42 +5413,42 @@
 "Seu nome de usu叩rio foi rejeitado pelo servidor. Ele provavelmente cont辿m "
 "caracteres inv叩lidos."
 
-#: src/protocols/irc/msgs.c:844
+#: src/protocols/irc/msgs.c:853
 msgid "Cannot change nick"
 msgstr "Imposs鱈vel mudar apelido"
 
-#: src/protocols/irc/msgs.c:844
+#: src/protocols/irc/msgs.c:853
 msgid "Could not change nick"
 msgstr "N達o foi poss鱈vel mudar apelido"
 
-#: src/protocols/irc/msgs.c:865
+#: src/protocols/irc/msgs.c:874
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Voc棚 saiu do canal%s%s"
 
-#: src/protocols/irc/msgs.c:907
+#: src/protocols/irc/msgs.c:916
 msgid "Error: invalid PONG from server"
 msgstr "Erro: PONG inv叩lido do servidor"
 
-#: src/protocols/irc/msgs.c:909
+#: src/protocols/irc/msgs.c:918
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "Resposta do PING -- Lat棚ncia: %lu segundos"
 
-#: src/protocols/irc/msgs.c:984
+#: src/protocols/irc/msgs.c:993
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Imposs鱈vel entrar no %s:"
 
-#: src/protocols/irc/msgs.c:985 src/protocols/silc/ops.c:914
+#: src/protocols/irc/msgs.c:994 src/protocols/silc/ops.c:947
 msgid "Cannot join channel"
 msgstr "Imposs鱈vel entrar no canal"
 
-#: src/protocols/irc/msgs.c:1019
+#: src/protocols/irc/msgs.c:1028
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Nick ou canal temporariamente indispon鱈vel."
 
-#: src/protocols/irc/msgs.c:1031
+#: src/protocols/irc/msgs.c:1040
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops de %s"
@@ -5421,6 +5466,10 @@
 "queira retornar do estado de aus棚ncia."
 
 #: src/protocols/irc/parse.c:116
+msgid "chanserv: Send a command to chanserv"
+msgstr "chanserv: Envia um comando para o chanserv"
+
+#: src/protocols/irc/parse.c:117
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
@@ -5428,7 +5477,7 @@
 "deop &lt;usu叩rio1&gt; [usu叩rio2] ...:  Remove o status de operador do canal "
 "de algu辿m. Voc棚 precisa ser um operador do canal para isso."
 
-#: src/protocols/irc/parse.c:117
+#: src/protocols/irc/parse.c:118
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -5438,7 +5487,7 @@
 "de algu辿m, impedindo esta pessoa de falar caso o canal esteja moderado (+m). "
 "Voc棚 precisa ser um operador do canal para isso."
 
-#: src/protocols/irc/parse.c:118
+#: src/protocols/irc/parse.c:119
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
@@ -5446,7 +5495,7 @@
 "invite &lt;usu叩rio&gt; [sala]:  Convida algu辿m para entrar no canal "
 "especificado, ou no canal atual."
 
-#: src/protocols/irc/parse.c:119
+#: src/protocols/irc/parse.c:120
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -5455,7 +5504,7 @@
 "canais, e opcionalmente forne巽a a chave do canal para cada um deles, se "
 "necess叩rio."
 
-#: src/protocols/irc/parse.c:120
+#: src/protocols/irc/parse.c:121
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -5464,7 +5513,7 @@
 "canais, e opcionalmente forne巽a a chave do canal para cada um deles, se "
 "necess叩rio."
 
-#: src/protocols/irc/parse.c:121
+#: src/protocols/irc/parse.c:122
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
@@ -5472,7 +5521,7 @@
 "kick &lt;usu叩rio&gt; [mensagem]:  Remove algu辿m de um canal. Voc棚 precisa "
 "ser operador do canal para isso."
 
-#: src/protocols/irc/parse.c:122
+#: src/protocols/irc/parse.c:123
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
@@ -5480,11 +5529,15 @@
 "list:  Exibe uma lista das salas de bate-papo da rede. <i>Cuidado, alguns "
 "servidores podem te desconectar caso voc棚 fa巽a isso.</i>"
 
-#: src/protocols/irc/parse.c:123
+#: src/protocols/irc/parse.c:124
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;a巽達o a realizar&gt;:  Realiza uma a巽達o."
 
-#: src/protocols/irc/parse.c:124
+#: src/protocols/irc/parse.c:125
+msgid "memoserv: Send a command to memoserv"
+msgstr "memoserv: Envia um comando para o memoserv"
+
+#: src/protocols/irc/parse.c:126
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
@@ -5492,7 +5545,7 @@
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|canal&gt;: Define ou remove um modo "
 "de usu叩rio ou canal."
 
-#: src/protocols/irc/parse.c:125
+#: src/protocols/irc/parse.c:127
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -5500,15 +5553,19 @@
 "msg &lt;usu叩rio&gt; &lt;mensagem&gt;:  Envia uma mensagem particular para um "
 "usu叩rio (ao contr叩rio de um canal)."
 
-#: src/protocols/irc/parse.c:126
+#: src/protocols/irc/parse.c:128
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [canal]:  Lista os usu叩rios que est達o no canal atualmente."
 
-#: src/protocols/irc/parse.c:127 src/protocols/jabber/jabber.c:1555
+#: src/protocols/irc/parse.c:129 src/protocols/jabber/jabber.c:1555
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;novo apelido&gt;:  Muda seu apelido."
 
-#: src/protocols/irc/parse.c:128
+#: src/protocols/irc/parse.c:130
+msgid "nickserv: Send a command to nickserv"
+msgstr "nickserv: Envia um comando para o nickserv"
+
+#: src/protocols/irc/parse.c:131
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -5516,7 +5573,7 @@
 "op &lt;usu叩rio1&gt; [usu叩rio2] ...:  D叩 o status de operador do canal para "
 "algu辿m. Voc棚 precisa ser operador do canal para isso."
 
-#: src/protocols/irc/parse.c:129
+#: src/protocols/irc/parse.c:132
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
@@ -5524,7 +5581,11 @@
 "operwall &lt;mensagem&gt;:  Se voc棚 n達o sabe o que 辿 isto, provavelmente n達o "
 "pode usar tal comando."
 
-#: src/protocols/irc/parse.c:130
+#: src/protocols/irc/parse.c:133
+msgid "operserv: Send a command to operserv"
+msgstr "operserv: Envia um comando para o operserv"
+
+#: src/protocols/irc/parse.c:134
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -5532,7 +5593,7 @@
 "part [sala] [mensagem]:  Sai do canal atual, ou de um canal especificado, "
 "com uma mensagem opcional."
 
-#: src/protocols/irc/parse.c:131
+#: src/protocols/irc/parse.c:135
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -5540,7 +5601,7 @@
 "ping [usu叩rio]: Verifica qual a lat棚ncia do usu叩rio (ou do servidor, caso "
 "nenhum usu叩rio tenha sido especificado)."
 
-#: src/protocols/irc/parse.c:132
+#: src/protocols/irc/parse.c:136
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -5548,15 +5609,15 @@
 "query &lt;usu叩rio&gt; &lt;mensagem&gt;:  Envia uma mensagem particular para "
 "um usu叩rio (ao contr叩rio de um canal)."
 
-#: src/protocols/irc/parse.c:133
+#: src/protocols/irc/parse.c:137
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [mensagem]:  Desconecta do servidor, com uma mensagem opcional."
 
-#: src/protocols/irc/parse.c:134
+#: src/protocols/irc/parse.c:138
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  Manda um comando puro para o servidor."
 
-#: src/protocols/irc/parse.c:135
+#: src/protocols/irc/parse.c:139
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -5564,19 +5625,19 @@
 "remove &lt;usu叩rio&gt; [mensagem]:  Remove algu辿m de um canal. Voc棚 precisa "
 "ser operador do canal para isso."
 
-#: src/protocols/irc/parse.c:136
+#: src/protocols/irc/parse.c:140
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: mostra a hora local atual do servidor de IRC."
 
-#: src/protocols/irc/parse.c:137
+#: src/protocols/irc/parse.c:141
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [novo t坦pico]:  V棚 ou altera o t坦pico do canal."
 
-#: src/protocols/irc/parse.c:138
+#: src/protocols/irc/parse.c:142
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Define ou remove um modo de usu叩rio."
 
-#: src/protocols/irc/parse.c:139
+#: src/protocols/irc/parse.c:143
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -5584,7 +5645,7 @@
 "voice &lt;usu叩rio1&gt; [usu叩rio2] ...:  D叩 o status de voice do canal para "
 "algu辿m. Voc棚 precisa ser operador do canal para isso."
 
-#: src/protocols/irc/parse.c:140
+#: src/protocols/irc/parse.c:144
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
@@ -5592,25 +5653,25 @@
 "wallops &lt;mensagem&gt;: Se voc棚 n達o sabe o que 辿 isto, provavelmente n達o "
 "pode usar tal comando."
 
-#: src/protocols/irc/parse.c:141
+#: src/protocols/irc/parse.c:145
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [servidor] &lt;nick&gt;:  Exibe informa巽探es do usu叩rio."
 
-#: src/protocols/irc/parse.c:422
+#: src/protocols/irc/parse.c:427
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Tempo de resposta de %s: %lu segundos"
 
-#: src/protocols/irc/parse.c:423
+#: src/protocols/irc/parse.c:428
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:423
+#: src/protocols/irc/parse.c:428
 msgid "CTCP PING reply"
 msgstr "Resposta do CTCP PING"
 
-#: src/protocols/irc/parse.c:526 src/protocols/irc/parse.c:530
-#: src/protocols/oscar/oscar.c:1653 src/protocols/toc/toc.c:190
+#: src/protocols/irc/parse.c:531 src/protocols/irc/parse.c:535
+#: src/protocols/oscar/oscar.c:1654 src/protocols/toc/toc.c:190
 #: src/protocols/toc/toc.c:688 src/protocols/toc/toc.c:704
 #: src/protocols/toc/toc.c:780
 msgid "Disconnected."
@@ -5662,12 +5723,12 @@
 msgstr "O servidor retornou uma identifica巽達o inv叩lida"
 
 #: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:667
-#: src/protocols/silc/ops.c:806
+#: src/protocols/silc/ops.c:839
 msgid "Full Name"
 msgstr "Nome completo"
 
 #: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:680
-#: src/protocols/silc/ops.c:818
+#: src/protocols/silc/ops.c:851
 msgid "Family Name"
 msgstr "Sobrenome"
 
@@ -5722,7 +5783,7 @@
 msgstr "Fun巽達o"
 
 #: src/protocols/jabber/buddy.c:266 src/protocols/jabber/buddy.c:701
-#: src/protocols/oscar/oscar.c:5987
+#: src/protocols/oscar/oscar.c:5981
 msgid "Birthday"
 msgstr "Data de nascimento"
 
@@ -5746,13 +5807,13 @@
 msgid "Resource"
 msgstr "Recurso"
 
-#: src/protocols/jabber/buddy.c:688 src/protocols/silc/ops.c:814
+#: src/protocols/jabber/buddy.c:688 src/protocols/silc/ops.c:847
 msgid "Middle Name"
 msgstr "Nome do meio"
 
 #: src/protocols/jabber/buddy.c:706 src/protocols/jabber/jabber.c:663
-#: src/protocols/oscar/oscar.c:6005 src/protocols/oscar/oscar.c:6013
-#: src/protocols/silc/ops.c:850
+#: src/protocols/oscar/oscar.c:5999 src/protocols/oscar/oscar.c:6007
+#: src/protocols/silc/ops.c:883
 msgid "Address"
 msgstr "Endere巽o"
 
@@ -5794,7 +5855,7 @@
 
 #: src/protocols/jabber/buddy.c:1085 src/protocols/jabber/chat.c:677
 #: src/protocols/jabber/chat.c:688 src/protocols/jabber/jabber.c:1018
-#: src/protocols/silc/ops.c:1235
+#: src/protocols/silc/ops.c:1268
 msgid "Error"
 msgstr "Erro"
 
@@ -5808,26 +5869,28 @@
 msgstr "Ausente (estendido)"
 
 #: src/protocols/jabber/buddy.c:1097 src/protocols/jabber/jabber.c:1071
-#: src/protocols/oscar/oscar.c:701 src/protocols/oscar/oscar.c:7791
-#: src/protocols/sametime/sametime.c:2770
+#: src/protocols/oscar/oscar.c:702 src/protocols/oscar/oscar.c:7762
+#: src/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "N達o perturbe"
 
 #: src/protocols/jabber/buddy.c:1235
 msgid "The following are the results of your search"
-msgstr ""
+msgstr "Os seguintes usu叩rios s達o os resultados da sua busca"
 
 #: src/protocols/jabber/buddy.c:1327
 msgid "Fill in one or more fields to search for any matching Jabber users."
 msgstr ""
+"Preencha um ou mais campos para procurar por qualquer usu叩rio Jabber que "
+"satisfa巽a tais crit辿rios."
 
 #: src/protocols/jabber/buddy.c:1331 src/protocols/jabber/jabber.c:653
-#: src/protocols/oscar/oscar.c:5962 src/protocols/silc/ops.c:810
+#: src/protocols/oscar/oscar.c:5956 src/protocols/silc/ops.c:843
 msgid "First Name"
 msgstr "Nome"
 
 #: src/protocols/jabber/buddy.c:1336 src/protocols/jabber/jabber.c:658
-#: src/protocols/oscar/oscar.c:5963
+#: src/protocols/oscar/oscar.c:5957
 msgid "Last Name"
 msgstr "Sobrenome"
 
@@ -5836,31 +5899,26 @@
 msgstr "Endere巽o de email"
 
 #: src/protocols/jabber/buddy.c:1355 src/protocols/jabber/buddy.c:1356
-#, fuzzy
 msgid "Search for Jabber users"
-msgstr "Procurar por um amigo pelo endere巽o de email"
+msgstr "Procurar por um usu叩rios do Jabber"
 
 #: src/protocols/jabber/buddy.c:1370
-#, fuzzy
 msgid "Invalid Directory"
-msgstr "Erro inv叩lido"
+msgstr "Diret坦rio inv叩lido"
 
 #: src/protocols/jabber/buddy.c:1387
-#, fuzzy
 msgid "Enter a User Directory"
-msgstr "Imposs鱈vel enviar um diret坦rio."
+msgstr "Digite um diret坦rio de usu叩rio"
 
 #: src/protocols/jabber/buddy.c:1388
-#, fuzzy
 msgid "Select a user directory to search"
-msgstr "Selecione um servidor de confer棚ncia a ser consultado"
+msgstr "Selecione um diret坦rio de usu叩rio para pesquisar"
 
 #: src/protocols/jabber/buddy.c:1391
-#, fuzzy
 msgid "Search Directory"
-msgstr "_Procurar por:"
-
-#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:7318
+msgstr "Pesquisar diret坦rio"
+
+#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:7289
 #: src/protocols/yahoo/yahoochat.c:979
 msgid "_Room:"
 msgstr "Sa_la:"
@@ -5925,7 +5983,7 @@
 msgstr "N達o 辿 poss鱈vel mudar o apelido em salas de bate-papo n達o-MUC"
 
 #: src/protocols/jabber/chat.c:678 src/protocols/jabber/chat.c:689
-#: src/protocols/silc/ops.c:1235
+#: src/protocols/silc/ops.c:1268
 msgid "Error retrieving room list"
 msgstr "Erro ao obter lista de salas"
 
@@ -5990,13 +6048,13 @@
 msgid "E-Mail"
 msgstr "Email"
 
-#: src/protocols/jabber/jabber.c:673 src/protocols/oscar/oscar.c:6007
-#: src/protocols/oscar/oscar.c:6015
+#: src/protocols/jabber/jabber.c:673 src/protocols/oscar/oscar.c:6001
+#: src/protocols/oscar/oscar.c:6009
 msgid "State"
 msgstr "Estado"
 
-#: src/protocols/jabber/jabber.c:683 src/protocols/silc/ops.c:855
-#: src/protocols/silc/silc.c:663 src/protocols/silc/util.c:513
+#: src/protocols/jabber/jabber.c:683 src/protocols/silc/ops.c:888
+#: src/protocols/silc/silc.c:664 src/protocols/silc/util.c:513
 msgid "Phone"
 msgstr "Telefone"
 
@@ -6017,7 +6075,7 @@
 msgid "Initializing Stream"
 msgstr "Inicializando fluxo"
 
-#: src/protocols/jabber/jabber.c:848 src/protocols/msn/session.c:368
+#: src/protocols/jabber/jabber.c:848 src/protocols/msn/session.c:355
 msgid "Authenticating"
 msgstr "Autenticando"
 
@@ -6027,7 +6085,7 @@
 
 #: src/protocols/jabber/jabber.c:928 src/protocols/jabber/jabber.c:1277
 #: src/protocols/jabber/jabber.c:1318 src/protocols/jabber/jabber.c:1351
-#: src/protocols/oscar/oscar.c:767 src/protocols/oscar/oscar.c:7589
+#: src/protocols/oscar/oscar.c:768 src/protocols/oscar/oscar.c:7560
 msgid "Not Authorized"
 msgstr "N達o autorizado"
 
@@ -6051,10 +6109,6 @@
 msgid "None (To pending)"
 msgstr "Nenhuma (Para pendente)"
 
-#: src/protocols/jabber/jabber.c:982 src/protocols/yahoo/yahoo.c:2780
-msgid "None"
-msgstr "Nenhuma"
-
 #: src/protocols/jabber/jabber.c:984
 msgid "Subscription"
 msgstr "Inscri巽達o"
@@ -6100,9 +6154,8 @@
 
 #. }
 #: src/protocols/jabber/jabber.c:1181
-#, fuzzy
 msgid "Search for users"
-msgstr "_Procurar por:"
+msgstr "Procurar usu叩rios"
 
 #: src/protocols/jabber/jabber.c:1257
 msgid "Bad Request"
@@ -6220,7 +6273,7 @@
 msgid "Resource Conflict"
 msgstr "Conflito de recursos"
 
-#: src/protocols/jabber/jabber.c:1333 src/protocols/silc/ops.c:1514
+#: src/protocols/jabber/jabber.c:1333 src/protocols/silc/ops.c:1547
 msgid "Connection Timeout"
 msgstr "Tempo limite de conex達o esgotado"
 
@@ -6306,14 +6359,14 @@
 msgstr "Imposs鱈vel banir usu叩rio %s"
 
 #: src/protocols/jabber/jabber.c:1464
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown affiliation: \"%s\""
-msgstr "Comando desconhecido: %s"
+msgstr "Filia巽達o desconhecida: \"%s\""
 
 #: src/protocols/jabber/jabber.c:1469
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to affiliate user %s as \"%s\""
-msgstr "Imposs鱈vel convidar usu叩rio (%s)."
+msgstr "Imposs鱈vel filiar usu叩rio %s como \"%s\""
 
 #: src/protocols/jabber/jabber.c:1521
 #, c-format
@@ -6349,6 +6402,8 @@
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
 msgstr ""
+"affliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Define a "
+"filia巽達o do usu叩rio � sala."
 
 #: src/protocols/jabber/jabber.c:1589
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
@@ -6400,12 +6455,11 @@
 msgstr "Permitir autentica巽達o em texto puro sobre fluxos n達o-encriptados"
 
 #: src/protocols/jabber/jabber.c:1732
-#, fuzzy
 msgid "Connect port"
-msgstr "Conectar"
+msgstr "Porta de conex達o"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1736 src/protocols/silc/silc.c:1593
+#: src/protocols/jabber/jabber.c:1736 src/protocols/silc/silc.c:1607
 msgid "Connect server"
 msgstr "Conectar ao servidor"
 
@@ -6452,13 +6506,13 @@
 msgstr "O usu叩rio %s quer adicionar %s a lista de amigos dele(a)."
 
 #: src/protocols/jabber/presence.c:297 src/protocols/msn/userlist.c:100
-#: src/protocols/oscar/oscar.c:4602 src/protocols/oscar/oscar.c:7248
+#: src/protocols/oscar/oscar.c:4595 src/protocols/oscar/oscar.c:7219
 #: src/protocols/yahoo/yahoo.c:895
 msgid "Authorize"
 msgstr "Autorizar"
 
 #: src/protocols/jabber/presence.c:298 src/protocols/msn/userlist.c:101
-#: src/protocols/oscar/oscar.c:4604 src/protocols/oscar/oscar.c:7249
+#: src/protocols/oscar/oscar.c:4597 src/protocols/oscar/oscar.c:7220
 #: src/protocols/yahoo/yahoo.c:897
 msgid "Deny"
 msgstr "Negar"
@@ -6716,8 +6770,8 @@
 msgid "Server too busy"
 msgstr "Servidor ocupado demais"
 
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2756
-#: src/protocols/silc/ops.c:1503 src/protocols/toc/toc.c:722
+#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2757
+#: src/protocols/silc/ops.c:1536 src/protocols/toc/toc.c:722
 msgid "Authentication failed"
 msgstr "Autentica巽達o mal sucedida"
 
@@ -6753,7 +6807,7 @@
 
 #: src/protocols/msn/msn.c:113
 msgid "You have just sent a Nudge!"
-msgstr ""
+msgstr "Voc棚 acabou de pedir a aten巽達o!"
 
 #: src/protocols/msn/msn.c:138
 msgid "Your new MSN friendly name is too long."
@@ -6801,7 +6855,7 @@
 
 #: src/protocols/msn/msn.c:328
 msgid "This Hotmail account may not be active."
-msgstr ""
+msgstr "Esta conta do Hotmail pode n達o estar ativa."
 
 #: src/protocols/msn/msn.c:354
 msgid "Send a mobile message."
@@ -6812,8 +6866,8 @@
 msgstr "Enviar"
 
 #: src/protocols/msn/msn.c:544 src/protocols/msn/msn.c:551
-#: src/protocols/msn/msn.c:554 src/protocols/yahoo/yahoo.c:2787
-#: src/protocols/yahoo/yahoo.c:2793
+#: src/protocols/msn/msn.c:554 src/protocols/yahoo/yahoo.c:2803
+#: src/protocols/yahoo/yahoo.c:2809
 #, c-format
 msgid ""
 "\n"
@@ -6827,17 +6881,17 @@
 msgstr "Tem voc棚"
 
 #: src/protocols/msn/msn.c:581 src/protocols/msn/state.c:33
-#: src/protocols/yahoo/yahoo.c:2615 src/protocols/yahoo/yahoo.c:3230
+#: src/protocols/yahoo/yahoo.c:2628 src/protocols/yahoo/yahoo.c:3211
 msgid "Be Right Back"
 msgstr "Volto j叩"
 
 #: src/protocols/msn/msn.c:589 src/protocols/msn/state.c:35
-#: src/protocols/yahoo/yahoo.c:2625 src/protocols/yahoo/yahoo.c:3245
+#: src/protocols/yahoo/yahoo.c:2638 src/protocols/yahoo/yahoo.c:3226
 msgid "On The Phone"
 msgstr "Ao telefone"
 
 #: src/protocols/msn/msn.c:593 src/protocols/msn/state.c:36
-#: src/protocols/yahoo/yahoo.c:2629 src/protocols/yahoo/yahoo.c:3251
+#: src/protocols/yahoo/yahoo.c:2642 src/protocols/yahoo/yahoo.c:3232
 msgid "Out To Lunch"
 msgstr "Em hor叩rio de almo巽o"
 
@@ -6872,13 +6926,13 @@
 
 #: src/protocols/msn/msn.c:647
 msgid "Open Hotmail Inbox"
-msgstr ""
+msgstr "Abrir caixa de entrada do Hotmail"
 
 #: src/protocols/msn/msn.c:671
 msgid "Send to Mobile"
 msgstr "Enviar para dispositivo m坦vel"
 
-#: src/protocols/msn/msn.c:680 src/protocols/novell/novell.c:3442
+#: src/protocols/msn/msn.c:680 src/protocols/novell/novell.c:3428
 msgid "Initiate _Chat"
 msgstr "Iniciar _bate-papo"
 
@@ -6894,85 +6948,80 @@
 msgid "Failed to connect to server."
 msgstr "Falha ao conectar ao servidor."
 
-#: src/protocols/msn/msn.c:1387 src/protocols/yahoo/yahoo_profile.c:654
+#: src/protocols/msn/msn.c:1371 src/protocols/yahoo/yahoo_profile.c:654
 #: src/protocols/zephyr/zephyr.c:721 src/protocols/zephyr/zephyr.c:1135
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>Apelido:</b> %s<br>"
 
 #. put a link to the actual profile URL
-#: src/protocols/msn/msn.c:1394 src/protocols/msn/msn.c:1740
-#: src/protocols/yahoo/yahoo_profile.c:1167 src/util.c:801
+#: src/protocols/msn/msn.c:1378 src/protocols/msn/msn.c:1724
+#: src/protocols/yahoo/yahoo_profile.c:1167 src/util.c:800
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b> "
 
-#: src/protocols/msn/msn.c:1471
+#: src/protocols/msn/msn.c:1455
 msgid "MSN Profile"
 msgstr "Perfil do MSN"
 
-#: src/protocols/msn/msn.c:1476 src/protocols/msn/msn.c:1727
+#: src/protocols/msn/msn.c:1460 src/protocols/msn/msn.c:1711
 #: src/protocols/yahoo/yahoo_profile.c:760
 msgid "Error retrieving profile"
 msgstr "Erro ao obter perfil"
 
-#: src/protocols/msn/msn.c:1546 src/protocols/oscar/oscar.c:5992
+#: src/protocols/msn/msn.c:1530 src/protocols/oscar/oscar.c:5986
 #: src/protocols/yahoo/yahoo_profile.c:1015
 msgid "Age"
 msgstr "Idade"
 
-#: src/protocols/msn/msn.c:1553 src/protocols/oscar/oscar.c:5979
-#: src/protocols/yahoo/yahoo_profile.c:1025
-msgid "Gender"
-msgstr "Sexo"
-
-#: src/protocols/msn/msn.c:1562 src/protocols/yahoo/yahoo_profile.c:1020
+#: src/protocols/msn/msn.c:1546 src/protocols/yahoo/yahoo_profile.c:1020
 msgid "Marital Status"
 msgstr "Estado civil"
 
-#: src/protocols/msn/msn.c:1569 src/protocols/novell/novell.c:1454
+#: src/protocols/msn/msn.c:1553 src/protocols/novell/novell.c:1459
 #: src/protocols/yahoo/yahoo_profile.c:1010
 msgid "Location"
 msgstr "Localiza巽達o"
 
-#: src/protocols/msn/msn.c:1577 src/protocols/yahoo/yahoo_profile.c:1030
+#: src/protocols/msn/msn.c:1561 src/protocols/yahoo/yahoo_profile.c:1030
 msgid "Occupation"
 msgstr "Ocupa巽達o"
 
-#: src/protocols/msn/msn.c:1594 src/protocols/msn/msn.c:1600
-#: src/protocols/msn/msn.c:1607 src/protocols/msn/msn.c:1615
-#: src/protocols/msn/msn.c:1622
+#: src/protocols/msn/msn.c:1578 src/protocols/msn/msn.c:1584
+#: src/protocols/msn/msn.c:1591 src/protocols/msn/msn.c:1599
+#: src/protocols/msn/msn.c:1606
 msgid "A Little About Me"
 msgstr "Um pouco sobre mim"
 
-#: src/protocols/msn/msn.c:1631 src/protocols/msn/msn.c:1637
-#: src/protocols/msn/msn.c:1644 src/protocols/msn/msn.c:1651
+#: src/protocols/msn/msn.c:1615 src/protocols/msn/msn.c:1621
+#: src/protocols/msn/msn.c:1628 src/protocols/msn/msn.c:1635
 msgid "Favorite Things"
 msgstr "Coisas favoritas"
 
-#: src/protocols/msn/msn.c:1660 src/protocols/msn/msn.c:1666
-#: src/protocols/msn/msn.c:1673
+#: src/protocols/msn/msn.c:1644 src/protocols/msn/msn.c:1650
+#: src/protocols/msn/msn.c:1657
 msgid "Hobbies and Interests"
 msgstr "Hobbies e interesses"
 
-#: src/protocols/msn/msn.c:1682 src/protocols/msn/msn.c:1688
+#: src/protocols/msn/msn.c:1666 src/protocols/msn/msn.c:1672
 #: src/protocols/yahoo/yahoo_profile.c:1072
 msgid "Favorite Quote"
 msgstr "Cita巽達o favorita"
 
-#: src/protocols/msn/msn.c:1696
+#: src/protocols/msn/msn.c:1680
 msgid "Last Updated"
 msgstr "�ltima atualiza巽達o"
 
-#: src/protocols/msn/msn.c:1707 src/protocols/silc/ops.c:846
+#: src/protocols/msn/msn.c:1691 src/protocols/silc/ops.c:879
 msgid "Homepage"
 msgstr "P叩gina da web"
 
-#: src/protocols/msn/msn.c:1729
+#: src/protocols/msn/msn.c:1713
 msgid "The user has not created a public profile."
 msgstr "O usu叩rio n達o criou um perfil p炭blico."
 
-#: src/protocols/msn/msn.c:1730
+#: src/protocols/msn/msn.c:1714
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -6982,7 +7031,7 @@
 "que o usu叩rio n達o existe, ou que o usu叩rio existe mas n達o criou um perfil "
 "p炭blico."
 
-#: src/protocols/msn/msn.c:1734
+#: src/protocols/msn/msn.c:1718
 msgid ""
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
@@ -6990,7 +7039,7 @@
 "O Gaim n達o encontrou nenhuma informa巽達o no perfil do usu叩rio. Provavelmente "
 "o usu叩rio n達o existe."
 
-#: src/protocols/msn/msn.c:1740 src/protocols/yahoo/yahoo_profile.c:1167
+#: src/protocols/msn/msn.c:1724 src/protocols/yahoo/yahoo_profile.c:1167
 msgid "Profile URL"
 msgstr "URL do Perfil"
 
@@ -7004,22 +7053,21 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1942 src/protocols/msn/msn.c:1944
+#: src/protocols/msn/msn.c:1926 src/protocols/msn/msn.c:1928
 msgid "MSN Protocol Plugin"
 msgstr "Plugin do protocolo MSN"
 
-#: src/protocols/msn/msn.c:1963
+#: src/protocols/msn/msn.c:1947
 msgid "Login server"
 msgstr "Servidor de login"
 
-#: src/protocols/msn/msn.c:1972
+#: src/protocols/msn/msn.c:1956
 msgid "Use HTTP Method"
 msgstr "Usar m辿todo HTTP"
 
-#: src/protocols/msn/msn.c:1980
-#, fuzzy
+#: src/protocols/msn/msn.c:1964
 msgid "nudge: nudge a contact to get their attention"
-msgstr "buzz: Chama a aten巽達o de um contato atrav辿s de um 'buzz'"
+msgstr "nudge: chama a aten巽達o de um contato"
 
 #: src/protocols/msn/nexus.c:103 src/protocols/msn/servconn.c:127
 #: src/protocols/yahoo/yahoochat.c:1326
@@ -7031,8 +7079,8 @@
 msgid "%s is not a valid group."
 msgstr "%s n達o 辿 um grupo v叩lido."
 
-#: src/protocols/msn/notification.c:184 src/protocols/msn/notification.c:528
-#: src/protocols/msn/session.c:347
+#: src/protocols/msn/notification.c:184 src/protocols/msn/notification.c:532
+#: src/protocols/msn/session.c:334
 msgid "Unknown error."
 msgstr "Erro desconhecido."
 
@@ -7066,16 +7114,20 @@
 msgid "%s is not a valid passport account."
 msgstr "%s n達o 辿 uma conta passport v叩lida."
 
-#: src/protocols/msn/notification.c:815
+#: src/protocols/msn/notification.c:528
+msgid "Service Temporarily Unavailable."
+msgstr "Servi巽o temporariamente indispon鱈vel."
+
+#: src/protocols/msn/notification.c:821
 msgid "Unable to rename group"
 msgstr "Imposs鱈vel renomear grupo"
 
-#: src/protocols/msn/notification.c:870
+#: src/protocols/msn/notification.c:876
 msgid "Unable to delete group"
 msgstr "Imposs鱈vel deletar grupo"
 
-#: src/protocols/msn/notification.c:1303
-#, fuzzy, c-format
+#: src/protocols/msn/notification.c:1309
+#, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
 "automatically be signed out at that time.  Please finish any conversations "
@@ -7095,19 +7147,9 @@
 "automaticamente desconectado depois desse tempo. Por favor termine quaisquer "
 "conversas em curso.\n"
 "\n"
-"Depois que a manuten巽達o terminar, voc棚 poder叩 conectar com sucesso.O "
-"servidor MSN vai sair do ar para manuten巽達o em %d minutos. Voc棚 ser叩 "
-"automaticamente desconectado depois desse tempo. Por favor termine quaisquer "
-"conversas em curso.\n"
-"\n"
 "Depois que a manuten巽達o terminar, voc棚 poder叩 conectar com sucesso."
 msgstr[1] ""
-"O servidor MSN vai sair do ar para manuten巽達o em %d minuto. Voc棚 ser叩 "
-"automaticamente desconectado depois desse tempo. Por favor termine quaisquer "
-"conversas em curso.\n"
-"\n"
-"Depois que a manuten巽達o terminar, voc棚 poder叩 conectar com sucesso.O "
-"servidor MSN vai sair do ar para manuten巽達o em %d minutos. Voc棚 ser叩 "
+"O servidor MSN vai sair do ar para manuten巽達o em %d minutos. Voc棚 ser叩 "
 "automaticamente desconectado depois desse tempo. Por favor termine quaisquer "
 "conversas em curso.\n"
 "\n"
@@ -7121,78 +7163,78 @@
 msgid "Reading error"
 msgstr "Erro de leitura"
 
-#: src/protocols/msn/servconn.c:133 src/protocols/msn/session.c:339
-#: src/protocols/oscar/oscar.c:4925
+#: src/protocols/msn/servconn.c:133 src/protocols/msn/session.c:326
+#: src/protocols/oscar/oscar.c:4918
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
-#: src/protocols/msn/servconn.c:136
-#, c-format
-msgid ""
-"Connection error from %s server (%s):\n"
+#: src/protocols/msn/servconn.c:138
+#, c-format
+msgid ""
+"Connection error from %s server:\n"
 "%s"
 msgstr ""
-"Erro de conex達o vindo do servidor %s (%s):\n"
+"Erro de conex達o vindo do servidor %s:\n"
 "%s"
 
-#: src/protocols/msn/session.c:317
+#: src/protocols/msn/session.c:304
 msgid "Our protocol is not supported by the server."
 msgstr "Nosso protocolo n達o 辿 suportado pelo servidor."
 
-#: src/protocols/msn/session.c:321
+#: src/protocols/msn/session.c:308
 msgid "Error parsing HTTP."
 msgstr "Erro processando HTTP."
 
 #. MSG_SERVER_GHOST
 #. Looks like someone logged in as us! =-O
-#: src/protocols/msn/session.c:325 src/protocols/napster/napster.c:450
-#: src/protocols/oscar/oscar.c:5629 src/protocols/yahoo/yahoo.c:194
+#: src/protocols/msn/session.c:312 src/protocols/napster/napster.c:450
+#: src/protocols/oscar/oscar.c:5622 src/protocols/yahoo/yahoo.c:194
 msgid "You have signed on from another location."
 msgstr "Voc棚 conectou de outro local."
 
-#: src/protocols/msn/session.c:328
+#: src/protocols/msn/session.c:315
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Os servidores MSN est達o temporariamente indispon鱈veis. Favor aguardar e "
 "tentar novamente."
 
-#: src/protocols/msn/session.c:333
+#: src/protocols/msn/session.c:320
 msgid "The MSN servers are going down temporarily."
 msgstr "Os servidores MSN v達o sair do ar temporariamente."
 
-#: src/protocols/msn/session.c:337
+#: src/protocols/msn/session.c:324
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Imposs鱈vel autenticar: %s"
 
-#: src/protocols/msn/session.c:342
+#: src/protocols/msn/session.c:329
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "Sua lista de amigos do MSN est叩 temporariamente indispon鱈vel. Favor aguardar "
 "e tentar novamente."
 
-#: src/protocols/msn/session.c:363 src/protocols/msn/session.c:365
+#: src/protocols/msn/session.c:350 src/protocols/msn/session.c:352
 msgid "Handshaking"
 msgstr "Handshaking"
 
-#: src/protocols/msn/session.c:364
+#: src/protocols/msn/session.c:351
 msgid "Transferring"
 msgstr "Transferindo"
 
-#: src/protocols/msn/session.c:366
+#: src/protocols/msn/session.c:353
 msgid "Starting authentication"
 msgstr "Iniciando autentica巽達o"
 
-#: src/protocols/msn/session.c:367
+#: src/protocols/msn/session.c:354
 msgid "Getting cookie"
 msgstr "Obtendo cookie"
 
-#: src/protocols/msn/session.c:369
+#: src/protocols/msn/session.c:356
 msgid "Sending cookie"
 msgstr "Enviando cookie"
 
-#: src/protocols/msn/session.c:370
+#: src/protocols/msn/session.c:357
 msgid "Retrieving buddy list"
 msgstr "Recuperando lista de amigos"
 
@@ -7227,9 +7269,9 @@
 msgstr "A mensagem pode n達o ter sido enviada devido a um erro desconhecido:"
 
 #: src/protocols/msn/switchboard.c:952
-#, fuzzy, c-format
+#, c-format
 msgid "%s just sent you a Nudge!"
-msgstr "%s deseja lhe enviar um arquivo"
+msgstr "%s pediu sua aten巽達o!"
 
 #: src/protocols/msn/userlist.c:85
 #, c-format
@@ -7458,41 +7500,41 @@
 msgid "Login failed (%s)."
 msgstr "A conex達o falhou (%s)."
 
-#: src/protocols/novell/novell.c:232
+#: src/protocols/novell/novell.c:233
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
 "Imposs鱈vel enviar mensagem. N達o foi poss鱈vel obter detalhes do usu叩rio (%s)."
 
-#: src/protocols/novell/novell.c:381
+#: src/protocols/novell/novell.c:382
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "Imposs鱈vel adicionar %s a sua lista de amigos (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
-#: src/protocols/novell/novell.c:407
+#: src/protocols/novell/novell.c:408
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "Imposs鱈vel enviar mensagem (%s)."
 
-#: src/protocols/novell/novell.c:478 src/protocols/novell/novell.c:972
+#: src/protocols/novell/novell.c:479 src/protocols/novell/novell.c:973
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Imposs鱈vel convidar usu叩rio (%s)."
 
-#: src/protocols/novell/novell.c:517
+#: src/protocols/novell/novell.c:518
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr ""
 "Imposs鱈vel enviar mensagem para %s. N達o foi poss鱈vel criar a confer棚ncia (%"
 "s)."
 
-#: src/protocols/novell/novell.c:522
+#: src/protocols/novell/novell.c:523
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "Imposs鱈vel enviar mensagem. N達o foi poss鱈vel criar a confer棚ncia (%s)."
 
-#: src/protocols/novell/novell.c:569
+#: src/protocols/novell/novell.c:570
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
@@ -7501,7 +7543,7 @@
 "Imposs鱈vel mover usu叩rio %s para a pasta %s na lista do servidor. Erro ao "
 "criar a pasta (%s)."
 
-#: src/protocols/novell/novell.c:617
+#: src/protocols/novell/novell.c:618
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
@@ -7510,67 +7552,67 @@
 "Imposs鱈vel adicionar %s � sua lista de amigos. Erro ao criar pasta na lista "
 "do servidor (%s)."
 
-#: src/protocols/novell/novell.c:690
+#: src/protocols/novell/novell.c:691
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "N達o foi poss鱈vel obter detalhes do usu叩rio %s (%s)."
 
-#: src/protocols/novell/novell.c:736 src/protocols/novell/novell.c:882
+#: src/protocols/novell/novell.c:737 src/protocols/novell/novell.c:883
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "Imposs鱈vel adicionar usu叩rio a sua lista de privacidade (%s)."
 
-#: src/protocols/novell/novell.c:783
+#: src/protocols/novell/novell.c:784
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "Imposs鱈vel adicionar %s a sua lista de usu叩rios bloqueados (%s)."
 
-#: src/protocols/novell/novell.c:836
+#: src/protocols/novell/novell.c:837
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "Imposs鱈vel adicionar %s a sua lista de amigos (%s)."
 
-#: src/protocols/novell/novell.c:904
+#: src/protocols/novell/novell.c:905
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "Imposs鱈vel remover %s da sua lista de privacidade (%s)."
 
-#: src/protocols/novell/novell.c:927 src/protocols/novell/novell.c:1628
+#: src/protocols/novell/novell.c:928 src/protocols/novell/novell.c:1633
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "Imposs鱈vel mudar configura巽探es de privacidade no servidor (%s)."
 
-#: src/protocols/novell/novell.c:999
+#: src/protocols/novell/novell.c:1000
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Imposs鱈vel criar confer棚ncia (%s)."
 
-#: src/protocols/novell/novell.c:1110 src/protocols/novell/novell.c:1667
+#: src/protocols/novell/novell.c:1111 src/protocols/novell/novell.c:1672
 msgid "Error communicating with server. Closing connection."
 msgstr "Erro na comunica巽達o com o servidor. Fechando a conex達o."
 
-#: src/protocols/novell/novell.c:1452
+#: src/protocols/novell/novell.c:1457
 msgid "Telephone Number"
 msgstr "N炭mero de telefone"
 
-#: src/protocols/novell/novell.c:1456
+#: src/protocols/novell/novell.c:1461
 msgid "Department"
 msgstr "Departamento"
 
-#: src/protocols/novell/novell.c:1458
+#: src/protocols/novell/novell.c:1463
 msgid "Personal Title"
 msgstr "Tratamento"
 
-#: src/protocols/novell/novell.c:1462
+#: src/protocols/novell/novell.c:1467
 msgid "Mailstop"
 msgstr "Mailstop"
 
-#: src/protocols/novell/novell.c:1464 src/protocols/oscar/oscar.c:5965
-#: src/protocols/oscar/oscar.c:5972
+#: src/protocols/novell/novell.c:1469 src/protocols/oscar/oscar.c:5959
+#: src/protocols/oscar/oscar.c:5966
 msgid "Email Address"
 msgstr "Endere巽o de email"
 
-#: src/protocols/novell/novell.c:1480
+#: src/protocols/novell/novell.c:1485
 msgid "User ID"
 msgstr "ID do usu叩rio"
 
@@ -7581,46 +7623,46 @@
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:1494
+#: src/protocols/novell/novell.c:1499
 msgid "Full name"
 msgstr "Nome completo"
 
-#: src/protocols/novell/novell.c:1618
+#: src/protocols/novell/novell.c:1623
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "Confer棚ncia GroupWise %d"
 
-#: src/protocols/novell/novell.c:1643
+#: src/protocols/novell/novell.c:1648
 msgid "Unable to make SSL connection to server."
 msgstr "Imposs鱈vel criar conex達o SSL com o servidor."
 
-#: src/protocols/novell/novell.c:1673
+#: src/protocols/novell/novell.c:1678
 #, c-format
 msgid "Error processing event or response (%s)."
 msgstr "Erro ao processar evento ou resposta (%s)."
 
-#: src/protocols/novell/novell.c:1707
+#: src/protocols/novell/novell.c:1712
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
-#: src/protocols/novell/novell.c:1719
+#: src/protocols/novell/novell.c:1724
 msgid "Unable to connect to server."
 msgstr "Imposs鱈vel conectar ao servidor."
 
-#: src/protocols/novell/novell.c:1722
+#: src/protocols/novell/novell.c:1727
 msgid "Waiting for response..."
 msgstr "Esperando resposta..."
 
-#: src/protocols/novell/novell.c:1857
+#: src/protocols/novell/novell.c:1862
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s foi convidado para esta conversa."
 
-#: src/protocols/novell/novell.c:1885
+#: src/protocols/novell/novell.c:1890
 msgid "Invitation to Conversation"
 msgstr "Convite para conversa"
 
-#: src/protocols/novell/novell.c:1886
+#: src/protocols/novell/novell.c:1891
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7631,15 +7673,15 @@
 "\n"
 "Enviado: %s"
 
-#: src/protocols/novell/novell.c:1888
+#: src/protocols/novell/novell.c:1893
 msgid "Would you like to join the conversation?"
 msgstr "Voc棚 deseja entrar na conversa?"
 
-#: src/protocols/novell/novell.c:1995
+#: src/protocols/novell/novell.c:2000
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "Voc棚 foi desconectado porque conectou em outra esta巽達o de trabalho."
 
-#: src/protocols/novell/novell.c:2051
+#: src/protocols/novell/novell.c:2056
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -7651,7 +7693,7 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:2149
+#: src/protocols/novell/novell.c:2154
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -7659,16 +7701,15 @@
 "Imposs鱈vel conectar ao servidor. Por favor digite o endere巽o do servidor em "
 "que voc棚 deseja conectar."
 
-#: src/protocols/novell/novell.c:2171
+#: src/protocols/novell/novell.c:2176
 msgid "Error. SSL support is not installed."
 msgstr "Erro. O suporte a SSL n達o est叩 instalado."
 
-#: src/protocols/novell/novell.c:2475
+#: src/protocols/novell/novell.c:2480
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Esta confer棚ncia foi fechada. N達o 辿 poss鱈vel enviar mais mensagens."
 
-#: src/protocols/novell/novell.c:2965 src/protocols/novell/novell.c:3047
-#: src/protocols/yahoo/yahoo.c:2839
+#: src/protocols/novell/novell.c:2973 src/protocols/yahoo/yahoo.c:2855
 msgid "Appear Offline"
 msgstr "Parecer desconectado"
 
@@ -7682,15 +7723,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:3540 src/protocols/novell/novell.c:3542
+#: src/protocols/novell/novell.c:3526 src/protocols/novell/novell.c:3528
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Plugin de protocolo do mensageiro do Novell GroupWise"
 
-#: src/protocols/novell/novell.c:3561
+#: src/protocols/novell/novell.c:3547
 msgid "Server address"
 msgstr "Endere巽o do servidor"
 
-#: src/protocols/novell/novell.c:3565
+#: src/protocols/novell/novell.c:3551
 msgid "Server port"
 msgstr "Porta do servidor"
 
@@ -7790,7 +7831,7 @@
 msgid "Not while on AOL"
 msgstr "N達o enquanto estiver na AOL"
 
-#: src/protocols/oscar/oscar.c:417 src/protocols/oscar/oscar.c:502
+#: src/protocols/oscar/oscar.c:418 src/protocols/oscar/oscar.c:503
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking to "
 "most likely has a buggy client.)"
@@ -7798,159 +7839,159 @@
 "(Houve um erro ao receber esta mensagem. O amigo com quem voc棚 est叩 falando "
 "provavelmente usa um cliente com defeito.)"
 
-#: src/protocols/oscar/oscar.c:616
+#: src/protocols/oscar/oscar.c:617
 msgid "Voice"
 msgstr "Voz"
 
-#: src/protocols/oscar/oscar.c:619
+#: src/protocols/oscar/oscar.c:620
 msgid "AIM Direct IM"
 msgstr "Mensagem instant但nea direta do AIM"
 
-#: src/protocols/oscar/oscar.c:622 src/protocols/silc/silc.c:659
+#: src/protocols/oscar/oscar.c:623 src/protocols/silc/silc.c:660
 #: src/protocols/silc/util.c:509
 msgid "Chat"
 msgstr "Bate-papo"
 
-#: src/protocols/oscar/oscar.c:625 src/protocols/oscar/oscar.c:7898
+#: src/protocols/oscar/oscar.c:626 src/protocols/oscar/oscar.c:7869
 msgid "Get File"
 msgstr "Receber arquivo"
 
-#: src/protocols/oscar/oscar.c:632
+#: src/protocols/oscar/oscar.c:633
 msgid "Games"
 msgstr "Jogos"
 
-#: src/protocols/oscar/oscar.c:635
+#: src/protocols/oscar/oscar.c:636
 msgid "Add-Ins"
 msgstr "Add-Ins"
 
-#: src/protocols/oscar/oscar.c:638
+#: src/protocols/oscar/oscar.c:639
 msgid "Send Buddy List"
 msgstr "Enviar lista de amigos"
 
-#: src/protocols/oscar/oscar.c:641
+#: src/protocols/oscar/oscar.c:642
 msgid "ICQ Direct Connect"
 msgstr "Conex達o direta do ICQ"
 
-#: src/protocols/oscar/oscar.c:644
+#: src/protocols/oscar/oscar.c:645
 msgid "AP User"
 msgstr "Usu叩rio AP"
 
-#: src/protocols/oscar/oscar.c:647
+#: src/protocols/oscar/oscar.c:648
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:650
+#: src/protocols/oscar/oscar.c:651
 msgid "Nihilist"
 msgstr "Niilista"
 
-#: src/protocols/oscar/oscar.c:653
+#: src/protocols/oscar/oscar.c:654
 msgid "ICQ Server Relay"
 msgstr "Relay do servidor ICQ"
 
-#: src/protocols/oscar/oscar.c:656
+#: src/protocols/oscar/oscar.c:657
 msgid "Old ICQ UTF8"
 msgstr "ICQ UTF8 antigo"
 
-#: src/protocols/oscar/oscar.c:659
+#: src/protocols/oscar/oscar.c:660
 msgid "Trillian Encryption"
 msgstr "Criptografia do Trillian"
 
-#: src/protocols/oscar/oscar.c:662
+#: src/protocols/oscar/oscar.c:663
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:665
+#: src/protocols/oscar/oscar.c:666
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:668
+#: src/protocols/oscar/oscar.c:669
 msgid "Security Enabled"
 msgstr "Seguran巽a ativada"
 
-#: src/protocols/oscar/oscar.c:671
+#: src/protocols/oscar/oscar.c:672
 msgid "Video Chat"
 msgstr "Bate-papo com v鱈deo"
 
-#: src/protocols/oscar/oscar.c:675
+#: src/protocols/oscar/oscar.c:676
 msgid "iChat AV"
 msgstr "AV do iChat"
 
-#: src/protocols/oscar/oscar.c:678
+#: src/protocols/oscar/oscar.c:679
 msgid "Live Video"
 msgstr "V鱈deo ao vivo"
 
-#: src/protocols/oscar/oscar.c:681
+#: src/protocols/oscar/oscar.c:682
 msgid "Camera"
 msgstr "C但mera"
 
-#: src/protocols/oscar/oscar.c:699 src/protocols/oscar/oscar.c:7781
+#: src/protocols/oscar/oscar.c:700 src/protocols/oscar/oscar.c:7752
 msgid "Free For Chat"
 msgstr "Livre para conversa"
 
-#: src/protocols/oscar/oscar.c:703 src/protocols/oscar/oscar.c:7796
+#: src/protocols/oscar/oscar.c:704 src/protocols/oscar/oscar.c:7767
 msgid "Not Available"
 msgstr "N達o dispon鱈vel"
 
-#: src/protocols/oscar/oscar.c:705 src/protocols/oscar/oscar.c:7786
+#: src/protocols/oscar/oscar.c:706 src/protocols/oscar/oscar.c:7757
 msgid "Occupied"
 msgstr "Ocupado"
 
-#: src/protocols/oscar/oscar.c:709
+#: src/protocols/oscar/oscar.c:710
 msgid "Web Aware"
 msgstr "Permitir que outros vejam seu status pela Web"
 
-#: src/protocols/oscar/oscar.c:786 src/protocols/oscar/oscar.c:5050
+#: src/protocols/oscar/oscar.c:787 src/protocols/oscar/oscar.c:5043
 msgid "Warning Level"
 msgstr "N鱈vel de alerta"
 
-#: src/protocols/oscar/oscar.c:792
+#: src/protocols/oscar/oscar.c:793
 msgid "Capabilities"
 msgstr "Recursos"
 
-#: src/protocols/oscar/oscar.c:801
+#: src/protocols/oscar/oscar.c:802
 msgid "Buddy Comment"
 msgstr "Coment叩rio do amigo"
 
-#: src/protocols/oscar/oscar.c:958
+#: src/protocols/oscar/oscar.c:959
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Mensagem instant但nea direta com %s fechada"
 
-#: src/protocols/oscar/oscar.c:960
+#: src/protocols/oscar/oscar.c:961
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Mensagem instant但nea direta com %s falhou"
 
-#: src/protocols/oscar/oscar.c:968
+#: src/protocols/oscar/oscar.c:969
 msgid "Direct Connect failed"
 msgstr "Conex達o direta falhou"
 
-#: src/protocols/oscar/oscar.c:1045 src/protocols/oscar/oscar.c:1176
+#: src/protocols/oscar/oscar.c:1046 src/protocols/oscar/oscar.c:1177
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Mensagem instant但nea direta com %s estabelecida"
 
-#: src/protocols/oscar/oscar.c:1126
+#: src/protocols/oscar/oscar.c:1127
 #, c-format
 msgid "Attempting to connect to %s at %s:%hu for Direct IM."
 msgstr "Tentando conectar a %s em %s:%hu para mensagem instant但nea direta."
 
-#: src/protocols/oscar/oscar.c:1547
+#: src/protocols/oscar/oscar.c:1548
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr ""
 "Pedindo para %s conectar a n坦s em %s:%hu para mensagem instant但nea direta."
 
-#: src/protocols/oscar/oscar.c:1552
+#: src/protocols/oscar/oscar.c:1553
 msgid "Unable to open Direct IM"
 msgstr "Imposs鱈vel abrir mensagem instant但nea direta"
 
-#: src/protocols/oscar/oscar.c:1587
+#: src/protocols/oscar/oscar.c:1588
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Voc棚 selecionou abrir uma mensagem instant但nea direta com %s."
 
-#: src/protocols/oscar/oscar.c:1591
+#: src/protocols/oscar/oscar.c:1592
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -7958,24 +7999,25 @@
 "Por revelar seu endere巽o IP, isto pode ser considerado um risco de "
 "privacidade. Deseja continuar?"
 
-#: src/protocols/oscar/oscar.c:1595 src/protocols/oscar/oscar.c:4361
+#: src/protocols/oscar/oscar.c:1596 src/protocols/oscar/oscar.c:4354
+#: src/protocols/sametime/sametime.c:3591
 msgid "Connect"
 msgstr "Conectar"
 
-#: src/protocols/oscar/oscar.c:1661
+#: src/protocols/oscar/oscar.c:1662
 #, c-format
 msgid "You have lost your connection to chat room %s."
 msgstr "Voc棚 perdeu sua conex達o com a sala %s."
 
-#: src/protocols/oscar/oscar.c:1684
+#: src/protocols/oscar/oscar.c:1685
 msgid "Chat is currently unavailable"
 msgstr "O recurso de bate-papo est叩 indispon鱈vel no momento"
 
-#: src/protocols/oscar/oscar.c:1754
+#: src/protocols/oscar/oscar.c:1755
 msgid "Screen name sent"
 msgstr "Nome de usu叩rio enviado"
 
-#: src/protocols/oscar/oscar.c:1770
+#: src/protocols/oscar/oscar.c:1771
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -7986,73 +8028,75 @@
 "de usu叩rio t棚m que come巽ar com uma letra e conter apenas letras, n炭meros e "
 "espa巽os, ou conter apenas n炭meros."
 
-#: src/protocols/oscar/oscar.c:1799
+#: src/protocols/oscar/oscar.c:1800
 msgid "Unable to login to AIM"
 msgstr "Imposs鱈vel conectar ao AIM"
 
-#: src/protocols/oscar/oscar.c:1903 src/protocols/oscar/oscar.c:2846
+#: src/protocols/oscar/oscar.c:1904 src/protocols/oscar/oscar.c:2847
 msgid "Could Not Connect"
 msgstr "N達o foi poss鱈vel conectar"
 
-#: src/protocols/oscar/oscar.c:1911
+#: src/protocols/oscar/oscar.c:1912
 msgid "Connection established, cookie sent"
 msgstr "Conex達o estabelecida, cookie enviado"
 
 #. clientip & verifiedip failed, request a redirect
 #. * that is, we want the sender to connect to us
 #. Let the user not to lose hope quite yet
-#: src/protocols/oscar/oscar.c:2063
-#, fuzzy
+#: src/protocols/oscar/oscar.c:2064
 msgid "Attempting connection redirect..."
-msgstr "Tentando conectar a %s em %s:%hu para mensagem instant但nea direta."
+msgstr "Tentando redirecionar a conex達o..."
 
 #. proxyip timed out
 #. * Yes, it's a bit odd to ask the user to enable proxied file transfers
 #. * when it's a proxied transfer that timed out. It is possible that a
 #. * stage 1/2 proxied transfer might work when a stage 3 will not.
-#: src/protocols/oscar/oscar.c:2108
+#: src/protocols/oscar/oscar.c:2109
 #, c-format
 msgid ""
 "Transfer of file %s timed out.\n"
 " Try enabling proxy servers for file transfers in Tools->Preferences->AIM/"
 "ICQ."
 msgstr ""
-
-#: src/protocols/oscar/oscar.c:2206 src/protocols/yahoo/yahoo_filexfer.c:174
+"O tempo limite para a transfer棚ncia do arquivo %s esgotou.\n"
+" Tente ativar os servidores de proxy para transfer棚ncia de arquivo em "
+"Ferramentas->Prefer棚ncias->AIM/ICQ."
+
+#: src/protocols/oscar/oscar.c:2207 src/protocols/yahoo/yahoo_filexfer.c:174
 #: src/protocols/yahoo/yahoo_filexfer.c:183
 #: src/protocols/yahoo/yahoo_filexfer.c:192
 msgid "Unable to establish file descriptor."
 msgstr "Imposs鱈vel estabelecer descritor de arquivo."
 
-#: src/protocols/oscar/oscar.c:2211
+#: src/protocols/oscar/oscar.c:2212
 msgid "Unable to create new connection."
 msgstr "Imposs鱈vel criar nova conex達o."
 
-#: src/protocols/oscar/oscar.c:2445 src/protocols/oscar/oscar.c:2454
-#: src/protocols/oscar/oscar.c:2468 src/protocols/oscar/oscar.c:2478
-#, fuzzy
+#: src/protocols/oscar/oscar.c:2446 src/protocols/oscar/oscar.c:2455
+#: src/protocols/oscar/oscar.c:2469 src/protocols/oscar/oscar.c:2479
 msgid "Unable to log into file transfer proxy."
-msgstr "Imposs鱈vel escrever arquivo %s."
-
-#: src/protocols/oscar/oscar.c:2532
-#, fuzzy
+msgstr "Imposs鱈vel efetuar autentica巽達o no proxy de transfer棚ncia de arquivos."
+
+#: src/protocols/oscar/oscar.c:2533
 msgid "Unable to establish listener socket or no AOL proxy connection present."
-msgstr "Imposs鱈vel estabelecer socket de escuta."
-
-#: src/protocols/oscar/oscar.c:2733 src/protocols/toc/toc.c:543
+msgstr ""
+"Imposs鱈vel criar um socket de escuta, ou n達o h叩 proxy de conex達o com a AOL "
+"dispon鱈vel."
+
+#: src/protocols/oscar/oscar.c:2734 src/protocols/toc/toc.c:543
 msgid "Incorrect nickname or password."
 msgstr "Usu叩rio ou senha incorreto(a)."
 
-#: src/protocols/oscar/oscar.c:2738
+#: src/protocols/oscar/oscar.c:2739
 msgid "Your account is currently suspended."
 msgstr "Atualmente, sua conta est叩 suspensa."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:2742
+#: src/protocols/oscar/oscar.c:2743
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "O servi巽o AOL Instant Messenger est叩 temporariamente indispon鱈vel."
 
-#: src/protocols/oscar/oscar.c:2747
+#: src/protocols/oscar/oscar.c:2748
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -8061,35 +8105,35 @@
 "minutos e tente novamente. Se voc棚 continuar tentando, vai ter que esperar "
 "ainda mais."
 
-#: src/protocols/oscar/oscar.c:2752
+#: src/protocols/oscar/oscar.c:2753
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "A vers達o do cliente que voc棚 est叩 usando 辿 velha demais. Favor atualizar em %"
 "s"
 
-#: src/protocols/oscar/oscar.c:2783
+#: src/protocols/oscar/oscar.c:2784
 msgid "Internal Error"
 msgstr "Erro interno"
 
-#: src/protocols/oscar/oscar.c:2853
+#: src/protocols/oscar/oscar.c:2854
 msgid "Received authorization"
 msgstr "Autoriza巽達o recebida"
 
-#: src/protocols/oscar/oscar.c:2877
+#: src/protocols/oscar/oscar.c:2878
 msgid "The SecurID key entered is invalid."
 msgstr "A chave SecurID digitada n達o 辿 v叩lida."
 
-#: src/protocols/oscar/oscar.c:2891
+#: src/protocols/oscar/oscar.c:2892
 msgid "Enter SecurID"
 msgstr "Digite SecurID"
 
-#: src/protocols/oscar/oscar.c:2892
+#: src/protocols/oscar/oscar.c:2893
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Digite o n炭mero de 6 d鱈gitos do display digital."
 
-#: src/protocols/oscar/oscar.c:2932 src/protocols/oscar/oscar.c:2962
-#: src/protocols/oscar/oscar.c:3051
+#: src/protocols/oscar/oscar.c:2933 src/protocols/oscar/oscar.c:2963
+#: src/protocols/oscar/oscar.c:3052
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -8098,24 +8142,24 @@
 "Voc棚 pode ser desconectado num curto per鱈odo de tempo. Voc棚 pode querer usar "
 "o TOC at辿 que isso esteja corrigido. Verifique por atualiza巽探es em %s."
 
-#: src/protocols/oscar/oscar.c:2935 src/protocols/oscar/oscar.c:2965
+#: src/protocols/oscar/oscar.c:2936 src/protocols/oscar/oscar.c:2966
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "O Gaim n達o p担de conseguir um hash de conex達o AIM v叩lido."
 
-#: src/protocols/oscar/oscar.c:3054
+#: src/protocols/oscar/oscar.c:3055
 msgid "Gaim was unable to get a valid login hash."
 msgstr "O Gaim n達o p担de conseguir um hash de conex達o v叩lido."
 
-#: src/protocols/oscar/oscar.c:3085
+#: src/protocols/oscar/oscar.c:3076
 msgid "Password sent"
 msgstr "Senha enviada"
 
-#: src/protocols/oscar/oscar.c:4352
+#: src/protocols/oscar/oscar.c:4345
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s acabou de pedir para fazer uma conex達o direta com %s"
 
-#: src/protocols/oscar/oscar.c:4355
+#: src/protocols/oscar/oscar.c:4348
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -8125,20 +8169,20 @@
 "para mensagens instant但neas com imagens. Por revelar seu IP, isto pode ser "
 "considerado um risco de privacidade."
 
-#: src/protocols/oscar/oscar.c:4394
+#: src/protocols/oscar/oscar.c:4387
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
 "Por favor me autorize para que eu possa adicion叩-lo � minha lista de amigos."
 
-#: src/protocols/oscar/oscar.c:4402
+#: src/protocols/oscar/oscar.c:4395
 msgid "Authorization Request Message:"
 msgstr "Mensagem para pedido de autoriza巽達o:"
 
-#: src/protocols/oscar/oscar.c:4403
+#: src/protocols/oscar/oscar.c:4396
 msgid "Please authorize me!"
 msgstr "Por favor me autorize!"
 
-#: src/protocols/oscar/oscar.c:4433
+#: src/protocols/oscar/oscar.c:4426
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -8147,21 +8191,21 @@
 "O usu叩rio %s requer autoriza巽達o antes de ser adicionado a uma lista de "
 "amigos. Voc棚 deseja enviar um pedido de autoriza巽達o?"
 
-#: src/protocols/oscar/oscar.c:4438 src/protocols/oscar/oscar.c:4440
+#: src/protocols/oscar/oscar.c:4431 src/protocols/oscar/oscar.c:4433
 msgid "Request Authorization"
 msgstr "Pedir autoriza巽達o"
 
-#: src/protocols/oscar/oscar.c:4478 src/protocols/oscar/oscar.c:4484
-#: src/protocols/oscar/oscar.c:4588 src/protocols/oscar/oscar.c:4612
-#: src/protocols/oscar/oscar.c:7234 src/protocols/oscar/oscar.c:7286
+#: src/protocols/oscar/oscar.c:4471 src/protocols/oscar/oscar.c:4477
+#: src/protocols/oscar/oscar.c:4581 src/protocols/oscar/oscar.c:4605
+#: src/protocols/oscar/oscar.c:7205 src/protocols/oscar/oscar.c:7257
 msgid "No reason given."
 msgstr "Nenhum motivo foi dado."
 
-#: src/protocols/oscar/oscar.c:4483
+#: src/protocols/oscar/oscar.c:4476
 msgid "Authorization Denied Message:"
 msgstr "Mensagem de recusa de autoriza巽達o:"
 
-#: src/protocols/oscar/oscar.c:4590
+#: src/protocols/oscar/oscar.c:4583
 #, c-format
 msgid ""
 "The user %u wants to add %s to their buddy list for the following reason:\n"
@@ -8171,11 +8215,11 @@
 "motivo: \n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4600 src/protocols/oscar/oscar.c:7246
+#: src/protocols/oscar/oscar.c:4593 src/protocols/oscar/oscar.c:7217
 msgid "Authorization Request"
 msgstr "Pedido de autoriza巽達o"
 
-#: src/protocols/oscar/oscar.c:4612
+#: src/protocols/oscar/oscar.c:4605
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8186,18 +8230,18 @@
 "seguinte motivo:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4613
+#: src/protocols/oscar/oscar.c:4606
 msgid "ICQ authorization denied."
 msgstr "Autoriza巽達o do ICQ negada."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:4620
+#: src/protocols/oscar/oscar.c:4613
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 "O usu叩rio %u aceitou seu pedido para adicion叩-lo � sua lista de amigos."
 
-#: src/protocols/oscar/oscar.c:4628
+#: src/protocols/oscar/oscar.c:4621
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8210,7 +8254,7 @@
 "De: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4636
+#: src/protocols/oscar/oscar.c:4629
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8223,7 +8267,7 @@
 "De: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4644
+#: src/protocols/oscar/oscar.c:4637
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -8236,113 +8280,113 @@
 "A mensagem 辿: \n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4665
+#: src/protocols/oscar/oscar.c:4658
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "O usu叩rio de ICQ %u lhe mandou um amigo: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:4671
+#: src/protocols/oscar/oscar.c:4664
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Voc棚 quer adicionar este amigo � sua lista de amigos?"
 
-#: src/protocols/oscar/oscar.c:4675
+#: src/protocols/oscar/oscar.c:4668
 msgid "Decline"
 msgstr "Rejeitar"
 
-#: src/protocols/oscar/oscar.c:4759
+#: src/protocols/oscar/oscar.c:4752
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
-msgstr[0] "Voc棚 perdeu %hu mensagem de %s por que ela era inv叩lida."
-msgstr[1] "Voc棚 perdeu %hu mensagens de %s por que elas eram inv叩lidas."
-
-#: src/protocols/oscar/oscar.c:4768
+msgstr[0] "Voc棚 perdeu %hu mensagem de %s porque ela era inv叩lida."
+msgstr[1] "Voc棚 perdeu %hu mensagens de %s porque elas eram inv叩lidas."
+
+#: src/protocols/oscar/oscar.c:4761
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "Voc棚 perdeu %hu mensagem de %s porque ela era muito extensa."
 msgstr[1] "Voc棚 perdeu %hu mensagens de %s porque elas eram muito extensas."
 
-#: src/protocols/oscar/oscar.c:4777
-#, fuzzy, c-format
+#: src/protocols/oscar/oscar.c:4770
+#, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
 msgid_plural ""
 "You missed %hu messages from %s because the rate limit has been exceeded."
-msgstr[0] "Voc棚 perdeu %hu mensagem de %s por que ela era inv叩lida."
-msgstr[1] "Voc棚 perdeu %hu mensagens de %s por que elas eram inv叩lidas."
-
-#: src/protocols/oscar/oscar.c:4786
+msgstr[0] "Voc棚 perdeu %hu mensagem de %s porque a taxa limite foi excedida."
+msgstr[1] "Voc棚 perdeu %hu mensagens de %s porque a taxa limite foi excedida."
+
+#: src/protocols/oscar/oscar.c:4779
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "Voc棚 perdeu %hu mensagem de %s porque ele(a) foi muito malvado(a)."
 msgstr[1] "Voc棚 perdeu %hu mensagens de %s porque ele(a) foi muito malvado(a)."
 
-#: src/protocols/oscar/oscar.c:4795
+#: src/protocols/oscar/oscar.c:4788
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "Voc棚 perdeu %hu mensagem de %s porque voc棚 辿 muito malvado(a)."
 msgstr[1] "Voc棚 perdeu %hu mensagens de %s porque voc棚 辿 muito malvado(a)."
 
-#: src/protocols/oscar/oscar.c:4804
+#: src/protocols/oscar/oscar.c:4797
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Voc棚 perdeu %hu mensagem de %s por um motivo desconhecido."
 msgstr[1] "Voc棚 perdeu %hu mensagens de %s por um motivo desconhecido."
 
-#: src/protocols/oscar/oscar.c:4863
+#: src/protocols/oscar/oscar.c:4856
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:4924
+#: src/protocols/oscar/oscar.c:4917
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "Erro do SNAC: %s\n"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:4961
+#: src/protocols/oscar/oscar.c:4954
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Imposs鱈vel enviar mensagem: %s"
 
-#: src/protocols/oscar/oscar.c:4961 src/protocols/oscar/oscar.c:4966
-#: src/protocols/oscar/oscar.c:5024 src/protocols/oscar/oscar.c:5028
+#: src/protocols/oscar/oscar.c:4954 src/protocols/oscar/oscar.c:4959
+#: src/protocols/oscar/oscar.c:5017 src/protocols/oscar/oscar.c:5021
 msgid "Unknown reason."
 msgstr "Motivo desconhecido."
 
-#: src/protocols/oscar/oscar.c:4964
+#: src/protocols/oscar/oscar.c:4957 src/protocols/sametime/sametime.c:2336
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Imposs鱈vel enviar mensagem para %s:"
 
-#: src/protocols/oscar/oscar.c:5024
+#: src/protocols/oscar/oscar.c:5017
 #, c-format
 msgid "User information not available: %s"
 msgstr "Informa巽達o do usu叩rio indispon鱈vel: %s"
 
-#: src/protocols/oscar/oscar.c:5027
+#: src/protocols/oscar/oscar.c:5020
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Informa巽達o do usu叩rio %s indispon鱈vel:"
 
-#: src/protocols/oscar/oscar.c:5054
+#: src/protocols/oscar/oscar.c:5047
 msgid "Online Since"
 msgstr "Conectado desde"
 
-#: src/protocols/oscar/oscar.c:5059 src/protocols/yahoo/yahoo_profile.c:1118
+#: src/protocols/oscar/oscar.c:5052 src/protocols/yahoo/yahoo_profile.c:1118
 msgid "Member Since"
 msgstr "Membro desde"
 
-#: src/protocols/oscar/oscar.c:5142
+#: src/protocols/oscar/oscar.c:5135
 msgid "Your AIM connection may be lost."
 msgstr "Sua conex達o AIM pode ter sido perdida."
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:5328
+#: src/protocols/oscar/oscar.c:5321
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -8350,11 +8394,11 @@
 "[N達o foi poss鱈vel exibir uma mensagem deste usu叩rio porque ela continha "
 "caracteres inv叩lidos.]"
 
-#: src/protocols/oscar/oscar.c:5554
+#: src/protocols/oscar/oscar.c:5547
 msgid "Rate limiting error."
 msgstr "Erro na limita巽達o da taxa."
 
-#: src/protocols/oscar/oscar.c:5555
+#: src/protocols/oscar/oscar.c:5548
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -8362,105 +8406,97 @@
 "A 炭ltima a巽達o que voc棚 tentou n達o p担de ser executada porque voc棚 excedeu a "
 "taxa limite. Por favor espere 10 segundos e tente novamente."
 
-#: src/protocols/oscar/oscar.c:5631
+#: src/protocols/oscar/oscar.c:5624
 msgid "You have been signed off for an unknown reason."
 msgstr "Voc棚 foi desconectado por um motivo desconhecido."
 
-#: src/protocols/oscar/oscar.c:5644 src/protocols/toc/toc.c:971
+#: src/protocols/oscar/oscar.c:5637 src/protocols/toc/toc.c:971
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Voc棚 foi desconectado da sala %s."
 
 #. XXX - Don't call this with ssi
-#: src/protocols/oscar/oscar.c:5669
+#: src/protocols/oscar/oscar.c:5662
 msgid "Finalizing connection"
 msgstr "Finalizando a conex達o"
 
-#: src/protocols/oscar/oscar.c:5951
+#: src/protocols/oscar/oscar.c:5945
 msgid "UIN"
 msgstr "UIN"
 
-#: src/protocols/oscar/oscar.c:5977 src/protocols/silc/util.c:541
+#: src/protocols/oscar/oscar.c:5971 src/protocols/silc/util.c:541
 msgid "Mobile Phone"
 msgstr "Telefone m坦vel"
 
-#: src/protocols/oscar/oscar.c:5979
-msgid "Female"
-msgstr "Feminino"
-
-#: src/protocols/oscar/oscar.c:5979
-msgid "Male"
-msgstr "Masculino"
-
-#: src/protocols/oscar/oscar.c:5995
+#: src/protocols/oscar/oscar.c:5989
 msgid "Personal Web Page"
 msgstr "P叩gina da web pessoal"
 
-#: src/protocols/oscar/oscar.c:5999
+#: src/protocols/oscar/oscar.c:5993
 msgid "Additional Information"
 msgstr "Informa巽探es adicionais"
 
-#: src/protocols/oscar/oscar.c:6004
+#: src/protocols/oscar/oscar.c:5998
 msgid "Home Address"
 msgstr "Endere巽o de casa"
 
-#: src/protocols/oscar/oscar.c:6008 src/protocols/oscar/oscar.c:6016
+#: src/protocols/oscar/oscar.c:6002 src/protocols/oscar/oscar.c:6010
 msgid "Zip Code"
 msgstr "C坦digo Postal (CEP)"
 
-#: src/protocols/oscar/oscar.c:6012
+#: src/protocols/oscar/oscar.c:6006
 msgid "Work Address"
 msgstr "Endere巽o do trabalho"
 
-#: src/protocols/oscar/oscar.c:6020
+#: src/protocols/oscar/oscar.c:6014
 msgid "Work Information"
 msgstr "Informa巽探es do trabalho"
 
-#: src/protocols/oscar/oscar.c:6021
+#: src/protocols/oscar/oscar.c:6015
 msgid "Company"
 msgstr "Empresa"
 
-#: src/protocols/oscar/oscar.c:6022
+#: src/protocols/oscar/oscar.c:6016
 msgid "Division"
 msgstr "Divis達o"
 
-#: src/protocols/oscar/oscar.c:6023
+#: src/protocols/oscar/oscar.c:6017
 msgid "Position"
 msgstr "Posi巽達o"
 
-#: src/protocols/oscar/oscar.c:6025
+#: src/protocols/oscar/oscar.c:6019
 msgid "Web Page"
 msgstr "P叩gina da web"
 
-#: src/protocols/oscar/oscar.c:6082
+#: src/protocols/oscar/oscar.c:6076
 msgid "Pop-Up Message"
 msgstr "Mensagem pop-up"
 
 #. TODO: Need to use ngettext() here
-#: src/protocols/oscar/oscar.c:6111
+#: src/protocols/oscar/oscar.c:6105
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr "Os seguintes nomes de usu叩rio est達o associados com %s"
 
-#: src/protocols/oscar/oscar.c:6140
+#: src/protocols/oscar/oscar.c:6134
 #, c-format
 msgid "No results found for email address %s"
 msgstr "Nenhum resultado encontrado para o endere巽o de email %s"
 
-#: src/protocols/oscar/oscar.c:6161
+#: src/protocols/oscar/oscar.c:6155
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "Voc棚 deve receber um email pedindo para confirmar %s."
 
-#: src/protocols/oscar/oscar.c:6163
+#: src/protocols/oscar/oscar.c:6157
 msgid "Account Confirmation Requested"
 msgstr "Confirma巽達o de conta recebida"
 
-#: src/protocols/oscar/oscar.c:6194
+#: src/protocols/oscar/oscar.c:6188
 msgid "Error Changing Account Info"
 msgstr "Erro ao mudar informa巽探es da conta"
 
-#: src/protocols/oscar/oscar.c:6197
+#: src/protocols/oscar/oscar.c:6191
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8469,14 +8505,14 @@
 "Erro 0x%04x: Imposs鱈vel formatar nome de usu叩rio pois o nome requisitado "
 "difere do original."
 
-#: src/protocols/oscar/oscar.c:6200
-#, fuzzy, c-format
+#: src/protocols/oscar/oscar.c:6194
+#, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
 "Erro 0x%04x: Imposs鱈vel formatar nome de usu叩rio pois o nome requisitado 辿 "
-"muito extenso."
-
-#: src/protocols/oscar/oscar.c:6203
+"inv叩lido."
+
+#: src/protocols/oscar/oscar.c:6197
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8485,7 +8521,7 @@
 "Erro 0x%04x: Imposs鱈vel formatar nome de usu叩rio pois o nome requisitado 辿 "
 "muito extenso."
 
-#: src/protocols/oscar/oscar.c:6206
+#: src/protocols/oscar/oscar.c:6200
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -8494,7 +8530,7 @@
 "Erro 0x%04x: Imposs鱈vel mudar endere巽o de email porque j叩 existe um pedido "
 "pendente para esse nome de usu叩rio."
 
-#: src/protocols/oscar/oscar.c:6209
+#: src/protocols/oscar/oscar.c:6203
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -8503,7 +8539,7 @@
 "Erro 0x%04x: Imposs鱈vel mudar o endere巽o de email porque este j叩 possui "
 "muitos nomes de usu叩rio associados a ele."
 
-#: src/protocols/oscar/oscar.c:6212
+#: src/protocols/oscar/oscar.c:6206
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -8511,12 +8547,12 @@
 msgstr ""
 "Erro 0x%04x: Imposs鱈vel mudar o endere巽o de email porque este 辿 inv叩lido."
 
-#: src/protocols/oscar/oscar.c:6215
+#: src/protocols/oscar/oscar.c:6209
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Erro 0x%04x: Erro desconhecido."
 
-#: src/protocols/oscar/oscar.c:6225
+#: src/protocols/oscar/oscar.c:6219
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -8525,27 +8561,27 @@
 "Atualmente, seu nome de usu叩rio est叩 formatado desta maneira:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6226 src/protocols/oscar/oscar.c:6233
+#: src/protocols/oscar/oscar.c:6220 src/protocols/oscar/oscar.c:6227
 msgid "Account Info"
 msgstr "Informa巽探es da conta"
 
-#: src/protocols/oscar/oscar.c:6231
+#: src/protocols/oscar/oscar.c:6225
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "O endere巽o de email de %s 辿 %s"
 
-#: src/protocols/oscar/oscar.c:6298
+#: src/protocols/oscar/oscar.c:6292
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Sua imagem da mensagem instant但nea n達o foi enviada. Voc棚 precisa estar "
 "conectado diretamente para enviar imagens por mensagens instant但neas."
 
-#: src/protocols/oscar/oscar.c:6480
+#: src/protocols/oscar/oscar.c:6511
 msgid "Unable to set AIM profile."
 msgstr "Imposs鱈vel definir perfil AIM."
 
-#: src/protocols/oscar/oscar.c:6481
+#: src/protocols/oscar/oscar.c:6512
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
@@ -8555,8 +8591,8 @@
 "procedimento de conex達o ser conclu鱈do. Seu perfil continua o mesmo; tente "
 "defini-lo novamente quando voc棚 estiver totalmente conectado."
 
-#: src/protocols/oscar/oscar.c:6495
-#, fuzzy, c-format
+#: src/protocols/oscar/oscar.c:6526
+#, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
 "it for you."
@@ -8565,19 +8601,17 @@
 "truncated it for you."
 msgstr[0] ""
 "O tamanho m叩ximo de %d byte do seu perfil foi excedido. O Gaim truncou-o "
-"para voc棚.O tamanho m叩ximo de %d bytes do seu perfil foi excedido. O Gaim "
-"truncou-o para voc棚."
+"para voc棚."
 msgstr[1] ""
-"O tamanho m叩ximo de %d byte do seu perfil foi excedido. O Gaim truncou-o "
-"para voc棚.O tamanho m叩ximo de %d bytes do seu perfil foi excedido. O Gaim "
-"truncou-o para voc棚."
-
-#: src/protocols/oscar/oscar.c:6500
+"O tamanho m叩ximo de %d bytes do seu perfil foi excedido. O Gaim truncou-o "
+"para voc棚."
+
+#: src/protocols/oscar/oscar.c:6531
 msgid "Profile too long."
 msgstr "Perfil muito extenso."
 
-#: src/protocols/oscar/oscar.c:6523 src/protocols/oscar/oscar.c:6596
-#, fuzzy, c-format
+#: src/protocols/oscar/oscar.c:6567
+#, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
 "truncated it for you."
@@ -8586,35 +8620,16 @@
 "truncated it for you."
 msgstr[0] ""
 "O tamanho m叩ximo de %d byte da mensagem de aus棚ncia foi excedido. O Gaim "
-"truncou-a e definiu seu status como ausente.O tamanho m叩ximo de %d bytes da "
-"mensagem de aus棚ncia foi excedido. O Gaim truncou-a e definiu seu status "
-"como ausente."
+"truncou-a para voc棚."
 msgstr[1] ""
 "O tamanho m叩ximo de %d byte da mensagem de aus棚ncia foi excedido. O Gaim "
-"truncou-a e definiu seu status como ausente.O tamanho m叩ximo de %d bytes da "
-"mensagem de aus棚ncia foi excedido. O Gaim truncou-a e definiu seu status "
-"como ausente."
-
-#: src/protocols/oscar/oscar.c:6528 src/protocols/oscar/oscar.c:6601
+"truncou-a para voc棚."
+
+#: src/protocols/oscar/oscar.c:6572
 msgid "Away message too long."
 msgstr "Mensagem de aus棚ncia muito extensa."
 
-#: src/protocols/oscar/oscar.c:6560
-msgid "Unable to set AIM away message."
-msgstr "Imposs鱈vel definir mensagem de aus棚ncia do AIM."
-
-#: src/protocols/oscar/oscar.c:6561
-msgid ""
-"You have probably requested to set your away message before the login "
-"procedure completed.  You remain in a \"present\" state; try setting it "
-"again when you are fully connected."
-msgstr ""
-"Voc棚 provavelmente requisitou que sua mensagem de aus棚ncia fosse definida "
-"antes do procedimento de conex達o ser conclu鱈do. Voc棚 permanece com um status "
-"\"presente\"; tente defini-lo novamente quando voc棚 estiver totalmente "
-"conectado."
-
-#: src/protocols/oscar/oscar.c:6691
+#: src/protocols/oscar/oscar.c:6663
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8625,16 +8640,16 @@
 "Nomes de usu叩rio t棚m que come巽ar com uma letra e conter apenas letras, "
 "n炭meros e espa巽os, ou conter apenas n炭meros."
 
-#: src/protocols/oscar/oscar.c:6693 src/protocols/oscar/oscar.c:7092
-#: src/protocols/oscar/oscar.c:7106 src/protocols/simple/simple.c:203
+#: src/protocols/oscar/oscar.c:6665 src/protocols/oscar/oscar.c:7063
+#: src/protocols/oscar/oscar.c:7077 src/protocols/simple/simple.c:203
 msgid "Unable To Add"
 msgstr "Imposs鱈vel adicionar"
 
-#: src/protocols/oscar/oscar.c:6798
+#: src/protocols/oscar/oscar.c:6770
 msgid "Unable To Retrieve Buddy List"
 msgstr "Imposs鱈vel recuperar lista de amigos"
 
-#: src/protocols/oscar/oscar.c:6799
+#: src/protocols/oscar/oscar.c:6771
 msgid ""
 "Gaim was temporarily unable to retrieve your buddy list from the AIM "
 "servers.  Your buddy list is not lost, and will probably become available in "
@@ -8644,13 +8659,13 @@
 "momento. Sua lista de amigos n達o foi perdida, e provavelmente estar叩 "
 "dispon鱈vel em algumas horas."
 
-#: src/protocols/oscar/oscar.c:6983 src/protocols/oscar/oscar.c:6984
-#: src/protocols/oscar/oscar.c:6989 src/protocols/oscar/oscar.c:7150
-#: src/protocols/oscar/oscar.c:7151 src/protocols/oscar/oscar.c:7156
+#: src/protocols/oscar/oscar.c:6961 src/protocols/oscar/oscar.c:6962
+#: src/protocols/oscar/oscar.c:6967 src/protocols/oscar/oscar.c:7121
+#: src/protocols/oscar/oscar.c:7122 src/protocols/oscar/oscar.c:7127
 msgid "Orphans"
 msgstr "�rf達os"
 
-#: src/protocols/oscar/oscar.c:7090
+#: src/protocols/oscar/oscar.c:7061
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8659,11 +8674,11 @@
 "N達o foi poss鱈vel adicionar o amigo %s porque voc棚 tem muitos amigos na sua "
 "lista de amigos. Por favor remova um e tente novamente."
 
-#: src/protocols/oscar/oscar.c:7090 src/protocols/oscar/oscar.c:7104
+#: src/protocols/oscar/oscar.c:7061 src/protocols/oscar/oscar.c:7075
 msgid "(no name)"
 msgstr "(sem nome)"
 
-#: src/protocols/oscar/oscar.c:7104
+#: src/protocols/oscar/oscar.c:7075
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8674,7 +8689,7 @@
 "mais comum para isso 辿 que voc棚 tem o n炭mero m叩ximo de amigos permitido na "
 "sua lista de amigos."
 
-#: src/protocols/oscar/oscar.c:7187
+#: src/protocols/oscar/oscar.c:7158
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -8683,11 +8698,11 @@
 "O usu叩rio %s lhe deu permiss達o para adicion叩-lo � sua lista de amigos. Voc棚 "
 "deseja adicion叩-lo?"
 
-#: src/protocols/oscar/oscar.c:7193
+#: src/protocols/oscar/oscar.c:7164
 msgid "Authorization Given"
 msgstr "Autoriza巽達o concedida"
 
-#: src/protocols/oscar/oscar.c:7237
+#: src/protocols/oscar/oscar.c:7208
 #, c-format
 msgid ""
 "The user %s wants to add %s to their buddy list for the following reason:\n"
@@ -8698,18 +8713,18 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:7282
+#: src/protocols/oscar/oscar.c:7253
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 "O usu叩rio %s aceitou seu pedido para adicion叩-lo � sua lista de amigos."
 
-#: src/protocols/oscar/oscar.c:7283
+#: src/protocols/oscar/oscar.c:7254
 msgid "Authorization Granted"
 msgstr "Autoriza巽達o concedida"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:7286
+#: src/protocols/oscar/oscar.c:7257
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8720,96 +8735,96 @@
 "seguinte motivo: \n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:7287
+#: src/protocols/oscar/oscar.c:7258
 msgid "Authorization Denied"
 msgstr "Autoriza巽達o negada"
 
-#: src/protocols/oscar/oscar.c:7324 src/protocols/toc/toc.c:1372
+#: src/protocols/oscar/oscar.c:7295 src/protocols/toc/toc.c:1372
 msgid "_Exchange:"
 msgstr "_Troca:"
 
-#: src/protocols/oscar/oscar.c:7360
+#: src/protocols/oscar/oscar.c:7331
 msgid "Invalid chat name specified."
 msgstr "Nome de bate-papo inv叩lido especificado."
 
-#: src/protocols/oscar/oscar.c:7430
+#: src/protocols/oscar/oscar.c:7401
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "Sua imagem da mensagem instant但nea n達o foi enviada. Voc棚 n達o pode enviar "
 "imagens por mensagens instant但neas em bate-papos do AIM."
 
-#: src/protocols/oscar/oscar.c:7565
+#: src/protocols/oscar/oscar.c:7536 src/protocols/sametime/sametime.c:5230
 msgid "Away Message"
 msgstr "Mensagem de away"
 
-#: src/protocols/oscar/oscar.c:7854
+#: src/protocols/oscar/oscar.c:7825
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Coment叩rio do amigo %s"
 
-#: src/protocols/oscar/oscar.c:7855
+#: src/protocols/oscar/oscar.c:7826
 msgid "Buddy Comment:"
 msgstr "Coment叩rio do amigo:"
 
-#: src/protocols/oscar/oscar.c:7874
+#: src/protocols/oscar/oscar.c:7845
 msgid "Edit Buddy Comment"
 msgstr "Editar coment叩rio do amigo"
 
+#: src/protocols/oscar/oscar.c:7851
+msgid "Get Status Msg"
+msgstr "Ver mensagem de status"
+
+#: src/protocols/oscar/oscar.c:7863
+msgid "Direct IM"
+msgstr "Mensagem instant但nea direta"
+
 #: src/protocols/oscar/oscar.c:7880
-msgid "Get Status Msg"
-msgstr "Ver mensagem de status"
-
-#: src/protocols/oscar/oscar.c:7892
-msgid "Direct IM"
-msgstr "Mensagem instant但nea direta"
-
-#: src/protocols/oscar/oscar.c:7909
 msgid "Re-request Authorization"
 msgstr "Re-requisitar autoriza巽達o"
 
+#: src/protocols/oscar/oscar.c:7940
+msgid "Require authorization"
+msgstr "Pedir autoriza巽達o"
+
+#: src/protocols/oscar/oscar.c:7943
+msgid "Hide IP address"
+msgstr "Esconder endere巽o IP"
+
+#: src/protocols/oscar/oscar.c:7946
+msgid "Web aware"
+msgstr "Permitir que outros vejam seu status pela Web"
+
+#: src/protocols/oscar/oscar.c:7951
+msgid "ICQ Privacy Options"
+msgstr "Op巽探es de privacidade do ICQ"
+
+#: src/protocols/oscar/oscar.c:7968
+msgid "The new formatting is invalid."
+msgstr "A nova formata巽達o 辿 inv叩lida."
+
 #: src/protocols/oscar/oscar.c:7969
-msgid "Require authorization"
-msgstr "Pedir autoriza巽達o"
-
-#: src/protocols/oscar/oscar.c:7972
-msgid "Hide IP address"
-msgstr "Esconder endere巽o IP"
-
-#: src/protocols/oscar/oscar.c:7975
-msgid "Web aware"
-msgstr "Permitir que outros vejam seu status pela Web"
-
-#: src/protocols/oscar/oscar.c:7980
-msgid "ICQ Privacy Options"
-msgstr "Op巽探es de privacidade do ICQ"
-
-#: src/protocols/oscar/oscar.c:7997
-msgid "The new formatting is invalid."
-msgstr "A nova formata巽達o 辿 inv叩lida."
-
-#: src/protocols/oscar/oscar.c:7998
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "A formata巽達o do nome do usu叩rio pode mudar apenas a capitaliza巽達o e os "
 "espa巽os."
 
-#: src/protocols/oscar/oscar.c:8005
+#: src/protocols/oscar/oscar.c:7976
 msgid "New screen name formatting:"
 msgstr "Nova formata巽達o do nome do usu叩rio:"
 
-#: src/protocols/oscar/oscar.c:8057
+#: src/protocols/oscar/oscar.c:8028
 msgid "Change Address To:"
 msgstr "Mudar endere巽o para:"
 
-#: src/protocols/oscar/oscar.c:8102
+#: src/protocols/oscar/oscar.c:8073
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>voc棚 n達o est叩 esperando autoriza巽達o</i>"
 
-#: src/protocols/oscar/oscar.c:8105
+#: src/protocols/oscar/oscar.c:8076
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Voc棚 est叩 esperando autoriza巽達o dos seguintes amigos"
 
-#: src/protocols/oscar/oscar.c:8106
+#: src/protocols/oscar/oscar.c:8077
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8817,83 +8832,85 @@
 "Voc棚 pode re-requisitar autoriza巽達o destes amigos clicando com o bot達o "
 "direito neles e selecionando \"Re-requisitar autoriza巽達o.\""
 
-#: src/protocols/oscar/oscar.c:8123
+#: src/protocols/oscar/oscar.c:8094
 msgid "Find Buddy by E-mail"
 msgstr "Encontrar amigo por email"
 
-#: src/protocols/oscar/oscar.c:8124
+#: src/protocols/oscar/oscar.c:8095
 msgid "Search for a buddy by e-mail address"
 msgstr "Procurar por um amigo pelo endere巽o de email"
 
-#: src/protocols/oscar/oscar.c:8125
+#: src/protocols/oscar/oscar.c:8096
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Digite o endere巽o de email do amigo que voc棚 est叩 procurando."
 
-#: src/protocols/oscar/oscar.c:8212 src/protocols/silc/silc.c:817
+#: src/protocols/oscar/oscar.c:8183 src/protocols/silc/silc.c:818
 msgid "Set User Info..."
 msgstr "Definir informa巽探es de usu叩rio..."
 
-#: src/protocols/oscar/oscar.c:8218
+#: src/protocols/oscar/oscar.c:8189
 msgid "Set User Info (URL)..."
 msgstr "Definir informa巽探es de usu叩rio (URL)..."
 
-#: src/protocols/oscar/oscar.c:8223 src/protocols/silc/silc.c:813
+#: src/protocols/oscar/oscar.c:8194 src/protocols/silc/silc.c:814
 msgid "Change Password..."
 msgstr "Alterar senha..."
 
-#: src/protocols/oscar/oscar.c:8229
+#: src/protocols/oscar/oscar.c:8200
 msgid "Change Password (URL)"
 msgstr "Mudar senha (URL)"
 
-#: src/protocols/oscar/oscar.c:8233
+#: src/protocols/oscar/oscar.c:8204
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configurar encaminhamento de mensagens (URL)"
 
 #. ICQ actions
-#: src/protocols/oscar/oscar.c:8243
+#: src/protocols/oscar/oscar.c:8214
 msgid "Show privacy options..."
 msgstr "Mostrar op巽探es de privacidade..."
 
 #. AIM actions
-#: src/protocols/oscar/oscar.c:8250
+#: src/protocols/oscar/oscar.c:8221
 msgid "Format Screen Name..."
 msgstr "Formatar nome de usu叩rio..."
 
-#: src/protocols/oscar/oscar.c:8254
+#: src/protocols/oscar/oscar.c:8225
 msgid "Confirm Account"
 msgstr "Confirmar conta"
 
-#: src/protocols/oscar/oscar.c:8258
+#: src/protocols/oscar/oscar.c:8229
 msgid "Display Currently Registered Address"
 msgstr "Mostrar o endere巽o registrado atualmente"
 
-#: src/protocols/oscar/oscar.c:8262
+#: src/protocols/oscar/oscar.c:8233
 msgid "Change Currently Registered Address..."
 msgstr "Mudar o endere巽o registrado atualmente..."
 
-#: src/protocols/oscar/oscar.c:8269
+#: src/protocols/oscar/oscar.c:8240
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Mostrar amigos esperando autoriza巽達o"
 
-#: src/protocols/oscar/oscar.c:8275
+#: src/protocols/oscar/oscar.c:8246
 msgid "Search for Buddy by Email..."
 msgstr "Procurar por amigos por email..."
 
-#: src/protocols/oscar/oscar.c:8280
+#: src/protocols/oscar/oscar.c:8251
 msgid "Search for Buddy by Information"
 msgstr "Procurar por amigos por informa巽探es"
 
-#: src/protocols/oscar/oscar.c:8350
+#: src/protocols/oscar/oscar.c:8321
 msgid "Use recent buddies group"
 msgstr "Usar grupo 'Contatos Recentes'"
 
-#: src/protocols/oscar/oscar.c:8353
+#: src/protocols/oscar/oscar.c:8324
 msgid "Show how long you have been idle"
 msgstr "Exibir por quanto tempo voc棚 est叩 inativo"
 
-#: src/protocols/oscar/oscar.c:8362
+#: src/protocols/oscar/oscar.c:8333
 msgid "Use AIM/ICQ proxy server (Slower/More Secure/Usually Works)"
 msgstr ""
+"Usar servidor de proxy do AIM/ICQ (Mais lento/mais seguro/geralmente "
+"funciona)"
 
 #. *< type
 #. *< ui_requirement
@@ -8905,178 +8922,522 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:8476 src/protocols/oscar/oscar.c:8478
+#: src/protocols/oscar/oscar.c:8447 src/protocols/oscar/oscar.c:8449
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "Plugin do protocolo AIM/ICQ"
 
-#: src/protocols/oscar/oscar.c:8497
+#: src/protocols/oscar/oscar.c:8468
 msgid "Auth host"
 msgstr "Host de autoriza巽達o"
 
-#: src/protocols/oscar/oscar.c:8500
+#: src/protocols/oscar/oscar.c:8471
 msgid "Auth port"
 msgstr "Porta de autoriza巽達o"
 
-#: src/protocols/oscar/oscar.c:8503 src/protocols/zephyr/zephyr.c:2892
+#: src/protocols/oscar/oscar.c:8474 src/protocols/zephyr/zephyr.c:2892
 msgid "Encoding"
 msgstr "Codifica巽達o"
 
-#: src/protocols/sametime/sametime.c:1134
+#: src/protocols/sametime/sametime.c:362
+msgid "Connection closed (writing)"
+msgstr "Conex達o fechada (ao escrever)"
+
+#: src/protocols/sametime/sametime.c:1270
+#, fuzzy, c-format
+msgid "<b>Group Title:</b> %s<br>"
+msgstr "<b>Usu叩rio:</b> %s<br>"
+
+#: src/protocols/sametime/sametime.c:1271
+#, fuzzy, c-format
+msgid "<b>Notes Group ID:</b> %s<br>"
+msgstr "<b>Usu叩rio:</b> %s<br>"
+
+#: src/protocols/sametime/sametime.c:1273
+#, c-format
+msgid "Info for Group %s"
+msgstr "Informa巽探es do grupo %s"
+
+#: src/protocols/sametime/sametime.c:1275
 #, fuzzy
+msgid "Notes Address Book Information"
+msgstr "Informa巽探es do trabalho"
+
+#: src/protocols/sametime/sametime.c:1307
+msgid "Invite Group to Conference..."
+msgstr "Convidar grupo para uma confer棚ncia..."
+
+#: src/protocols/sametime/sametime.c:1316
+#, fuzzy
+msgid "Get Notes Address Book Info"
+msgstr "Adicionar ao cat叩logo de endere巽os"
+
+#: src/protocols/sametime/sametime.c:1437
 msgid "Sending Handshake"
-msgstr "Enviando cookie"
-
-#: src/protocols/sametime/sametime.c:1139
-#, fuzzy
+msgstr "Negociando"
+
+#: src/protocols/sametime/sametime.c:1442
 msgid "Waiting for Handshake Acknowledgement"
-msgstr "Esperando o come巽o da transfer棚ncia"
-
-#: src/protocols/sametime/sametime.c:1144
+msgstr "Esperando a aceita巽達o do pedido"
+
+#: src/protocols/sametime/sametime.c:1447
 msgid "Handshake Acknowledged, Sending Login"
-msgstr ""
-
-#: src/protocols/sametime/sametime.c:1149
+msgstr "Pedido aceito, enviando login"
+
+#: src/protocols/sametime/sametime.c:1452
 msgid "Waiting for Login Acknowledgement"
-msgstr ""
-
-#: src/protocols/sametime/sametime.c:1154
-#, fuzzy
+msgstr "Esperando a aceita巽達o do login"
+
+#: src/protocols/sametime/sametime.c:1457
 msgid "Login Redirected"
-msgstr "Servidor de login"
-
-#: src/protocols/sametime/sametime.c:1159
-#, fuzzy
+msgstr "Login redirecionado"
+
+#: src/protocols/sametime/sametime.c:1463
 msgid "Forcing Login"
-msgstr "Conectando"
-
-#: src/protocols/sametime/sametime.c:1163
+msgstr "For巽ando o login"
+
+#: src/protocols/sametime/sametime.c:1467
 msgid "Login Acknowledged"
-msgstr ""
-
-#: src/protocols/sametime/sametime.c:1168
-#, fuzzy
+msgstr "Login aceito"
+
+#: src/protocols/sametime/sametime.c:1472
 msgid "Connected to Sametime Community Server"
-msgstr "Conectando ao servidor SILC"
+msgstr "Conectando ao servidor comunit叩rio do Sametime"
 
 #. * @todo Admin alerts should probably be in a conversation window
 #. rather than a gaim_notify_message. Or in some sort of updating
 #. dialog, or something.
-#: src/protocols/sametime/sametime.c:1263
+#: src/protocols/sametime/sametime.c:1566
 msgid "Admin Alert"
-msgstr ""
-
-#: src/protocols/sametime/sametime.c:2758
+msgstr "Alerta do administrador"
+
+#: src/protocols/sametime/sametime.c:1623
+msgid "Connection reset"
+msgstr "Conex達o fechada"
+
+#: src/protocols/sametime/sametime.c:1630
+#, c-format
+msgid "Error reading from socket: %s"
+msgstr "Erro ao ler do socket: %s"
+
+#. this is a regular connect, error out
+#: src/protocols/sametime/sametime.c:1659
+#: src/protocols/sametime/sametime.c:3650
+msgid "Unable to connect to host"
+msgstr "Imposs鱈vel conectar ao servidor"
+
+#: src/protocols/sametime/sametime.c:1698
+#, c-format
+msgid "Announcement from %s"
+msgstr "An炭ncio de %s"
+
+#: src/protocols/sametime/sametime.c:1869
+msgid "Conference Closed"
+msgstr "Confer棚ncia fechada"
+
+#: src/protocols/sametime/sametime.c:2330
+msgid "Unable to send message: "
+msgstr "Imposs鱈vel enviar mensagem: "
+
+#: src/protocols/sametime/sametime.c:2937
+#, fuzzy
+msgid "Place Closed"
+msgstr "Cancelada"
+
+#: src/protocols/sametime/sametime.c:3224
+msgid "Microphone"
+msgstr "Microfone"
+
+#: src/protocols/sametime/sametime.c:3225
+msgid "Speakers"
+msgstr "Caixas de som"
+
+#: src/protocols/sametime/sametime.c:3226
+msgid "Video Camera"
+msgstr "C但mera de v鱈deo"
+
+#: src/protocols/sametime/sametime.c:3230
+msgid "File Transfer"
+msgstr "Transfer棚ncia de arquivos"
+
+#: src/protocols/sametime/sametime.c:3251
+#, c-format
+msgid ""
+"\n"
+"<b>Status</b>: %s"
+msgstr ""
+"\n"
+"<b>Status</b>: %s"
+
+#: src/protocols/sametime/sametime.c:3256
+#, c-format
+msgid ""
+"\n"
+"<b>Message</b>: %s"
+msgstr ""
+"\n"
+"<b>Mensagem</b>: %s"
+
+#: src/protocols/sametime/sametime.c:3262
+#, c-format
+msgid ""
+"\n"
+"<b>Supports</b>: %s"
+msgstr ""
+"\n"
+"<b>Suporta</b>: %s"
+
+#: src/protocols/sametime/sametime.c:3267
+msgid ""
+"\n"
+"<b>External User</b>"
+msgstr ""
+"\n"
+"<b>Usu叩rio externo</b>"
+
+#: src/protocols/sametime/sametime.c:3285
 msgid "Active"
 msgstr "Ativo"
 
-#: src/protocols/simple/simple.c:202
-#, c-format
-msgid ""
-"Could not add the buddy %s because every simple user has to start with "
-"'sip:'."
-msgstr ""
-
-#: src/protocols/simple/simple.c:1209
-#, fuzzy
-msgid "Could not create listen socket"
-msgstr "Imposs鱈vel criar socket"
-
-#: src/protocols/simple/simple.c:1263
-#, fuzzy
-msgid "SIP usernames may not contain whitespaces or @ symbols"
-msgstr "Apelidos do IRC n達o podem conter espa巽os"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#: src/protocols/simple/simple.c:1408
+#: src/protocols/sametime/sametime.c:3374
+msgid "Create conference with user"
+msgstr "Criar confer棚ncia com usu叩rio"
+
+#: src/protocols/sametime/sametime.c:3375
+#, c-format
+msgid ""
+"Please enter a topic for the new conference, and an invitation message to be "
+"sent to %s"
+msgstr ""
+"Favor digitar um t坦pico para a nova confer�ncia, e uma mensagem de convite "
+"para ser enviada a %s"
+
+#: src/protocols/sametime/sametime.c:3379
+msgid "New Conference"
+msgstr "Nova confer棚ncia"
+
+#: src/protocols/sametime/sametime.c:3381
+msgid "Create"
+msgstr "Criar"
+
+#: src/protocols/sametime/sametime.c:3443
+msgid "Available Conferences"
+msgstr "Confer棚ncias dispon鱈veis"
+
+#: src/protocols/sametime/sametime.c:3449
+msgid "Create New Conference..."
+msgstr "Criar nova confer棚ncia..."
+
+#: src/protocols/sametime/sametime.c:3456
+msgid "Invite user to a conference"
+msgstr "Convidar usu叩rio para uma confer棚ncia"
+
+#: src/protocols/sametime/sametime.c:3457
+#, c-format
+msgid ""
+"Select a conference from the list below to send an invite to user %s. Select "
+"\"Create New Conference\" if you'd like to create a new conference to invite "
+"this user to."
+msgstr ""
+"Selecione uma confer棚ncia da lista abaixo para enviar um convite para o "
+"usu叩rio %s. Selecione \"Criar nova confer棚ncia\" se voc棚 deseja criar uma "
+"nova conversa e convidar este usu叩rio para a mesma."
+
+#: src/protocols/sametime/sametime.c:3462
+msgid "Invite to Conference"
+msgstr "Convidar para confer棚ncia"
+
+#: src/protocols/sametime/sametime.c:3464
+msgid "Invite"
+msgstr "Convidar"
+
+#: src/protocols/sametime/sametime.c:3516
+msgid "Invite to Conference..."
+msgstr "Convidar para confer棚ncia..."
+
+#: src/protocols/sametime/sametime.c:3562
+msgid "No Sametime Community Server specified"
+msgstr "Nenhum servidor comunit叩rio do Sametime foi especificado"
+
+#: src/protocols/sametime/sametime.c:3583
+#, c-format
+msgid ""
+"No host or IP address has been configured for the Meanwhile account %s. "
+"Please enter one below to continue logging in."
+msgstr ""
+"Nenhum host ou endere巽o IP foi configurado para a conta Meanwhile %s. Favor "
+"digitar um abaixo para continuar o processo de conex達o."
+
+#: src/protocols/sametime/sametime.c:3588
 #, fuzzy
-msgid "SIP/SIMPLE Protocol Plugin"
-msgstr "Plugin do protocolo SILC"
-
-#. *  summary
-#: src/protocols/simple/simple.c:1409
+msgid "Meanwhile Connection Setup"
+msgstr "Configura巽探es da conex達o do Meanwhile"
+
+#: src/protocols/sametime/sametime.c:3589
+msgid "No Sametime Community Server Specified"
+msgstr "Nenhum servidor comunit叩rio do Sametime foi especificado"
+
+#: src/protocols/sametime/sametime.c:4044
+msgid "<b>External User</b><br>"
+msgstr "<b>Usu叩rio externo</b><br>"
+
+#: src/protocols/sametime/sametime.c:4047
+#, c-format
+msgid "<b>User ID:</b> %s<br>"
+msgstr "<b>ID do usu叩rio:</b> %s<br>"
+
+#: src/protocols/sametime/sametime.c:4053
+#, c-format
+msgid "<b>Full Name:</b> %s<br>"
+msgstr "<b>Nome completo:</b> %s<br>"
+
+#: src/protocols/sametime/sametime.c:4059
+msgid "<b>Last Known Client:</b> "
+msgstr "<b>�ltimo cliente visto:</b>"
+
+#: src/protocols/sametime/sametime.c:4067
+#, c-format
+msgid "Unknown (0x%04x)<br>"
+msgstr "Desconhecido (0x%04x)<br>"
+
+#: src/protocols/sametime/sametime.c:4074
+#, c-format
+msgid "<b>Supports:</b> %s<br>"
+msgstr "<b>Suporta:</b> %s<br>"
+
+#: src/protocols/sametime/sametime.c:4080
+#, c-format
+msgid "<b>Status:</b> %s"
+msgstr "<b>Status:</b> %s"
+
+#: src/protocols/sametime/sametime.c:4321
+#: src/protocols/sametime/sametime.c:5437
+msgid "Possible Matches"
+msgstr "Resultados poss鱈veis"
+
+#: src/protocols/sametime/sametime.c:4358
+msgid "An ambiguous user ID was entered"
+msgstr "Um ID de usu叩rio amb鱈guo foi digitado"
+
+#: src/protocols/sametime/sametime.c:4359
+#, c-format
+msgid ""
+"The identifier '%s' may possibly refer to any of the following users. Please "
+"select the correct user from the list below to add them to your buddy list."
+msgstr ""
+"O identificador '%s' pode possivelmente referir-se a qualquer um dos "
+"seguintes usu叩rios. Por favor, selecione o usu叩rio correto da lista abaixo "
+"para adicion叩-los � sua lista de contatos."
+
+#: src/protocols/sametime/sametime.c:4364
+msgid "Select User to Add"
+msgstr "Selecionar usu叩rio a adicionar"
+
+#: src/protocols/sametime/sametime.c:4366
+msgid "Add User"
+msgstr "Adicionar usu叩rio"
+
+#: src/protocols/sametime/sametime.c:4427
+msgid "Unable to add user: user not found"
+msgstr "Imposs鱈vel adicionar usu叩rio: usu叩rio n達o encontrado"
+
+#: src/protocols/sametime/sametime.c:4429
+#, c-format
+msgid ""
+"The identifier '%s' did not match any users in your Sametime community. This "
+"entry has been removed from your buddy list."
+msgstr ""
+"O identificador '%s' n達o resultou em nenhum usu叩rio da sua comunidade "
+"Samtime. Esta entrada foi removida da sua lista de amigos."
+
+#: src/protocols/sametime/sametime.c:4434
+msgid "Unable to add user"
+msgstr "Imposs鱈vel adicionar usu叩rio"
+
+#: src/protocols/sametime/sametime.c:5003
+#, c-format
+msgid ""
+"Error reading file %s: \n"
+"%s\n"
+msgstr ""
+"Erro ao ler o arquivo %s: \n"
+"%s\n"
+
+#: src/protocols/sametime/sametime.c:5122
+msgid "Remotely Stored Buddy List"
+msgstr "Lista de amigos armazenada remotamente"
+
+#: src/protocols/sametime/sametime.c:5127
+msgid "Buddy List Storage Mode"
+msgstr "Modo de armazenamento da lista de amigos"
+
+#: src/protocols/sametime/sametime.c:5130
+msgid "Local Buddy List Only"
+msgstr "Apenas lista de amigos local"
+
+#: src/protocols/sametime/sametime.c:5132
+msgid "Merge List from Server"
+msgstr "Mesclar lista do servidor"
+
+#: src/protocols/sametime/sametime.c:5134
+msgid "Merge and Save List to Server"
+msgstr "Mesclar e salvar lista no servidor"
+
+#: src/protocols/sametime/sametime.c:5136
+msgid "Synchronize List with Server"
+msgstr "Sincronizar lista com o servidor"
+
+#: src/protocols/sametime/sametime.c:5224
+msgid "Active Message"
+msgstr "Mensagem ativa"
+
+#: src/protocols/sametime/sametime.c:5236
+msgid "Busy Message"
+msgstr "Mensagem de ocupado"
+
+#: src/protocols/sametime/sametime.c:5240
+msgid "Default status messages"
+msgstr "Mensagens de status padr達o"
+
+#: src/protocols/sametime/sametime.c:5243
+msgid "Edit Status Messages"
+msgstr "Editar mensagens de status"
+
+#: src/protocols/sametime/sametime.c:5286
+#, c-format
+msgid "Import Sametime List for Account %s"
+msgstr "Importar lista do Sametime da conta %s"
+
+#: src/protocols/sametime/sametime.c:5325
+#, c-format
+msgid "Export Sametime List for Account %s"
+msgstr "Exportar lista do Sametime da conta %s"
+
+#: src/protocols/sametime/sametime.c:5376
+msgid "Unable to add group: group exists"
+msgstr "Imposs鱈vel adicionar grupo: o grupo existe"
+
+#: src/protocols/sametime/sametime.c:5377
+#, c-format
+msgid "A group named '%s' already exists in your buddy list."
+msgstr "Um grupo chamado '%s' j叩 existe na sua lista de amigos."
+
+#: src/protocols/sametime/sametime.c:5380
+#: src/protocols/sametime/sametime.c:5505
+msgid "Unable to add group"
+msgstr "Imposs鱈vel adicionar grupo"
+
+#: src/protocols/sametime/sametime.c:5453
+msgid "Notes Address Book group results"
+msgstr ""
+
+#: src/protocols/sametime/sametime.c:5454
+#, c-format
+msgid ""
+"The identifier '%s' may possibly refer to any of the following Notes Address "
+"Book groups. Please select the correct group from the list below to add it "
+"to your buddy list."
+msgstr ""
+
+#: src/protocols/sametime/sametime.c:5459
 #, fuzzy
-msgid "The SIP/SIMPLE Protocol Plugin"
-msgstr "Plugin do protocolo SILC"
-
-#. *  description
-#: src/protocols/simple/simple.c:1410
-msgid "Thomas Butter <butter@uni-mannheim.de>"
-msgstr ""
-
-#: src/protocols/simple/simple.c:1431
-msgid "Publish Status (note: everyone may watch you)"
-msgstr ""
-
-#: src/protocols/simple/simple.c:1434
+msgid "Select Notes Address Book"
+msgstr "Adicionar ao cat叩logo de endere巽os"
+
+#: src/protocols/sametime/sametime.c:5499
+msgid "Unable to add group: group not found"
+msgstr "Imposs鱈vel adicionar grupo: grupo n達o encontrado"
+
+#: src/protocols/sametime/sametime.c:5501
+#, c-format
+msgid ""
+"The identifier '%s' did not match any Notes Address Book groups in your "
+"Sametime community."
+msgstr ""
+
+#: src/protocols/sametime/sametime.c:5541
 #, fuzzy
-msgid "Use UDP"
-msgstr "ID do usu叩rio"
-
-#: src/protocols/simple/simple.c:1436
-#, fuzzy
-msgid "Use Proxy"
-msgstr "Nenhum proxy"
-
-#: src/protocols/simple/simple.c:1438
-#, fuzzy
-msgid "Proxy"
-msgstr "Nenhum proxy"
-
-#: src/protocols/silc/buddy.c:51 src/protocols/silc/buddy.c:419
-#: src/protocols/silc/buddy.c:544 src/protocols/silc/buddy.c:711
+msgid "Notes Address Book Group"
+msgstr "Adicionar ao cat叩logo de endere巽os"
+
+#: src/protocols/sametime/sametime.c:5542
+msgid ""
+"Enter the name of a Notes Address Book group in the field below to add the "
+"group and its members to your buddy list."
+msgstr ""
+
+#: src/protocols/sametime/sametime.c:5557
+msgid "Set Status Messages..."
+msgstr "Definir mensagens de status..."
+
+#: src/protocols/sametime/sametime.c:5561
+msgid "Import Sametime List..."
+msgstr "Importar lista do Sametime..."
+
+#: src/protocols/sametime/sametime.c:5565
+msgid "Export Sametime List..."
+msgstr "Exportar lista do Sametime..."
+
+#: src/protocols/sametime/sametime.c:5569
+msgid "Add Notes Address Book Group..."
+msgstr "Adicionar ao cat叩logo de endere巽os"
+
+#. notesbuddy hack encoding
+#: src/protocols/sametime/sametime.c:5663
+msgid "NotesBuddy Encoding"
+msgstr "Codifica巽達o do NotesBuddy"
+
+#: src/protocols/sametime/sametime.c:5672
+msgid "Force Login (Ignore Server Redirects)"
+msgstr "For巽ar login (ignorar redirecionamentos do servidor)"
+
+#: src/protocols/silc/buddy.c:52 src/protocols/silc/buddy.c:420
+#: src/protocols/silc/buddy.c:545 src/protocols/silc/buddy.c:712
 #: src/protocols/silc/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "O usu叩rio %s n達o est叩 presente na rede"
 
-#: src/protocols/silc/buddy.c:52 src/protocols/silc/buddy.c:114
-#: src/protocols/silc/buddy.c:119 src/protocols/silc/buddy.c:123
-#: src/protocols/silc/buddy.c:128 src/protocols/silc/buddy.c:133
-#: src/protocols/silc/buddy.c:138 src/protocols/silc/buddy.c:256
+#: src/protocols/silc/buddy.c:53 src/protocols/silc/buddy.c:115
+#: src/protocols/silc/buddy.c:120 src/protocols/silc/buddy.c:124
+#: src/protocols/silc/buddy.c:129 src/protocols/silc/buddy.c:134
+#: src/protocols/silc/buddy.c:139 src/protocols/silc/buddy.c:257
 msgid "Key Agreement"
 msgstr "Acordo de chaves"
 
-#: src/protocols/silc/buddy.c:53
+#: src/protocols/silc/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr "N達o foi poss鱈vel fazer o acordo de chaves"
 
-#: src/protocols/silc/buddy.c:115
+#: src/protocols/silc/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr "Erro ao fazer o acordo de chaves"
 
-#: src/protocols/silc/buddy.c:119
+#: src/protocols/silc/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "Falha ao fazer o acordo de chaves"
 
-#: src/protocols/silc/buddy.c:124
+#: src/protocols/silc/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr "Tempo esgotado ao fazer o acordo de chaves"
 
-#: src/protocols/silc/buddy.c:129
+#: src/protocols/silc/buddy.c:130
 msgid "Key agreement was aborted"
 msgstr "O acordo de chaves foi abortado"
 
-#: src/protocols/silc/buddy.c:134
+#: src/protocols/silc/buddy.c:135
 msgid "Key agreement is already started"
 msgstr "O acordo de chaves j叩 come巽ou"
 
-#: src/protocols/silc/buddy.c:139
+#: src/protocols/silc/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr "O acordo de chaves n達o pode ser iniciado com voc棚 mesmo"
 
-#: src/protocols/silc/buddy.c:257 src/protocols/silc/buddy.c:387
-#: src/protocols/silc/buddy.c:512
+#: src/protocols/silc/buddy.c:258 src/protocols/silc/buddy.c:388
+#: src/protocols/silc/buddy.c:513
 msgid "The remote user is not present in the network any more"
 msgstr "O usu叩rio remoto n達o est叩 mais presente na rede"
 
-#: src/protocols/silc/buddy.c:293
+#: src/protocols/silc/buddy.c:294
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
@@ -9085,7 +9446,7 @@
 "Um pedido de acordo de chaves foi recebido de %s. Voc棚 gostaria de fazer o "
 "acordo de chaves?"
 
-#: src/protocols/silc/buddy.c:297
+#: src/protocols/silc/buddy.c:298
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -9096,59 +9457,59 @@
 "Host remoto: %s\n"
 "Porta remota: %d"
 
-#: src/protocols/silc/buddy.c:310
+#: src/protocols/silc/buddy.c:311
 msgid "Key Agreement Request"
 msgstr "Pedido de acordo de chaves"
 
-#: src/protocols/silc/buddy.c:386 src/protocols/silc/buddy.c:421
-#: src/protocols/silc/buddy.c:463
+#: src/protocols/silc/buddy.c:387 src/protocols/silc/buddy.c:422
+#: src/protocols/silc/buddy.c:464
 msgid "IM With Password"
 msgstr "Mensagem instant但nea com senha"
 
-#: src/protocols/silc/buddy.c:422
+#: src/protocols/silc/buddy.c:423
 msgid "Cannot set IM key"
 msgstr "Imposs鱈vel definir chave da mensagem instant但nea"
 
-#: src/protocols/silc/buddy.c:464
+#: src/protocols/silc/buddy.c:465
 msgid "Set IM Password"
 msgstr "Definir senha de mensagens instant但neas"
 
-#: src/protocols/silc/buddy.c:511 src/protocols/silc/buddy.c:546
-#: src/protocols/silc/ops.c:1278 src/protocols/silc/ops.c:1289
+#: src/protocols/silc/buddy.c:512 src/protocols/silc/buddy.c:547
+#: src/protocols/silc/ops.c:1311 src/protocols/silc/ops.c:1322
 msgid "Get Public Key"
 msgstr "Obter chave p炭blica"
 
-#: src/protocols/silc/buddy.c:547 src/protocols/silc/ops.c:1279
-#: src/protocols/silc/ops.c:1290
+#: src/protocols/silc/buddy.c:548 src/protocols/silc/ops.c:1312
+#: src/protocols/silc/ops.c:1323
 msgid "Cannot fetch the public key"
 msgstr "Imposs鱈vel obter chave p炭blica"
 
-#: src/protocols/silc/buddy.c:634 src/protocols/silc/buddy.c:1583
+#: src/protocols/silc/buddy.c:635 src/protocols/silc/buddy.c:1601
 msgid "Show Public Key"
 msgstr "Exibir chave p炭blica"
 
-#: src/protocols/silc/buddy.c:635 src/protocols/silc/buddy.c:994
-#: src/protocols/silc/chat.c:235
+#: src/protocols/silc/buddy.c:636 src/protocols/silc/buddy.c:995
+#: src/protocols/silc/chat.c:236
 msgid "Could not load public key"
 msgstr "N達o foi poss鱈vel carregar chave p炭blica"
 
-#: src/protocols/silc/buddy.c:712 src/protocols/silc/ops.c:873
-#: src/protocols/silc/ops.c:945 src/protocols/silc/ops.c:1080
-#: src/protocols/silc/ops.c:1081 src/protocols/silc/ops.c:1099
+#: src/protocols/silc/buddy.c:713 src/protocols/silc/ops.c:906
+#: src/protocols/silc/ops.c:978 src/protocols/silc/ops.c:1113
+#: src/protocols/silc/ops.c:1114 src/protocols/silc/ops.c:1132
 msgid "User Information"
 msgstr "Informa巽探es do usu叩rio"
 
-#: src/protocols/silc/buddy.c:713 src/protocols/silc/ops.c:946
-#: src/protocols/silc/ops.c:1100
+#: src/protocols/silc/buddy.c:714 src/protocols/silc/ops.c:979
+#: src/protocols/silc/ops.c:1133
 msgid "Cannot get user information"
 msgstr "Imposs鱈vel obter informa巽探es do usu叩rio"
 
-#: src/protocols/silc/buddy.c:734
+#: src/protocols/silc/buddy.c:735
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "O amigo %s n達o 辿 certificado"
 
-#: src/protocols/silc/buddy.c:737
+#: src/protocols/silc/buddy.c:738
 msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
@@ -9157,16 +9518,16 @@
 "deste. Voc棚 pode usar o comando Obter Chave P炭blica para faz棚-lo."
 
 #. Open file selector to select the public key.
-#: src/protocols/silc/buddy.c:1028
+#: src/protocols/silc/buddy.c:1029
 msgid "Open..."
 msgstr "Abrir..."
 
-#: src/protocols/silc/buddy.c:1037
+#: src/protocols/silc/buddy.c:1038
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "O amigo %s n達o est叩 presente na rede"
 
-#: src/protocols/silc/buddy.c:1040
+#: src/protocols/silc/buddy.c:1041
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
@@ -9174,15 +9535,15 @@
 "Para adicionar um amigo voc棚 precisa importar a chave p炭blica desde. "
 "Pressione importar para importar uma chave p炭blica."
 
-#: src/protocols/silc/buddy.c:1043
+#: src/protocols/silc/buddy.c:1044
 msgid "Import..."
 msgstr "Importar..."
 
-#: src/protocols/silc/buddy.c:1130
+#: src/protocols/silc/buddy.c:1131
 msgid "Select correct user"
 msgstr "Selecione o usu叩rio correto"
 
-#: src/protocols/silc/buddy.c:1132
+#: src/protocols/silc/buddy.c:1133
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
@@ -9190,7 +9551,7 @@
 "Mais de um usu叩rio foi encontrado com a mesma chave p炭blica. Selecione o "
 "usu叩rio correto da lista para adicion叩-lo � sua lista de amigos."
 
-#: src/protocols/silc/buddy.c:1134
+#: src/protocols/silc/buddy.c:1135
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
@@ -9198,213 +9559,217 @@
 "Mais de um usu叩rio foi encontrado com o mesmo nome. Selecione o usu叩rio "
 "correto da lista para adicion叩-lo � sua lista de amigos."
 
-#: src/protocols/silc/buddy.c:1415
+#: src/protocols/silc/buddy.c:1420
 msgid "Detached"
 msgstr "Desconectado, mas na rede"
 
-#: src/protocols/silc/buddy.c:1419 src/protocols/silc/silc.c:56
+#: src/protocols/silc/buddy.c:1424 src/protocols/silc/silc.c:57
 msgid "Indisposed"
 msgstr "Indisposto"
 
-#: src/protocols/silc/buddy.c:1423 src/protocols/silc/silc.c:58
+#: src/protocols/silc/buddy.c:1428 src/protocols/silc/silc.c:59
 msgid "Wake Me Up"
 msgstr "Me acorde"
 
-#: src/protocols/silc/buddy.c:1425 src/protocols/silc/silc.c:50
+#: src/protocols/silc/buddy.c:1430 src/protocols/silc/silc.c:51
 msgid "Hyper Active"
 msgstr "Hiperativo"
 
-#: src/protocols/silc/buddy.c:1427
+#: src/protocols/silc/buddy.c:1432
 msgid "Robot"
 msgstr "Rob担"
 
-#: src/protocols/silc/buddy.c:1434 src/protocols/silc/silc.c:634
+#: src/protocols/silc/buddy.c:1439 src/protocols/silc/silc.c:635
 #: src/protocols/silc/util.c:472
 msgid "Happy"
 msgstr "Feliz"
 
-#: src/protocols/silc/buddy.c:1436 src/protocols/silc/silc.c:636
+#: src/protocols/silc/buddy.c:1441 src/protocols/silc/silc.c:637
 #: src/protocols/silc/util.c:474
 msgid "Sad"
 msgstr "Triste"
 
-#: src/protocols/silc/buddy.c:1438 src/protocols/silc/silc.c:638
+#: src/protocols/silc/buddy.c:1443 src/protocols/silc/silc.c:639
 #: src/protocols/silc/util.c:476
 msgid "Angry"
 msgstr "Furioso"
 
-#: src/protocols/silc/buddy.c:1440 src/protocols/silc/silc.c:640
+#: src/protocols/silc/buddy.c:1445 src/protocols/silc/silc.c:641
 #: src/protocols/silc/util.c:478
 msgid "Jealous"
 msgstr "Enciumado"
 
-#: src/protocols/silc/buddy.c:1442 src/protocols/silc/silc.c:642
+#: src/protocols/silc/buddy.c:1447 src/protocols/silc/silc.c:643
 #: src/protocols/silc/util.c:480
 msgid "Ashamed"
 msgstr "Envergonhado"
 
-#: src/protocols/silc/buddy.c:1444 src/protocols/silc/silc.c:644
+#: src/protocols/silc/buddy.c:1449 src/protocols/silc/silc.c:645
 #: src/protocols/silc/util.c:482
 msgid "Invincible"
 msgstr "Invenc鱈vel"
 
-#: src/protocols/silc/buddy.c:1446 src/protocols/silc/silc.c:646
+#: src/protocols/silc/buddy.c:1451 src/protocols/silc/silc.c:647
 #: src/protocols/silc/util.c:484
 msgid "In Love"
 msgstr "Apaixonado"
 
-#: src/protocols/silc/buddy.c:1448 src/protocols/silc/silc.c:648
+#: src/protocols/silc/buddy.c:1453 src/protocols/silc/silc.c:649
 #: src/protocols/silc/util.c:486
 msgid "Sleepy"
 msgstr "Sonolento"
 
-#: src/protocols/silc/buddy.c:1450 src/protocols/silc/silc.c:650
+#: src/protocols/silc/buddy.c:1455 src/protocols/silc/silc.c:651
 #: src/protocols/silc/util.c:488
 msgid "Bored"
 msgstr "Chateado"
 
-#: src/protocols/silc/buddy.c:1452 src/protocols/silc/silc.c:652
+#: src/protocols/silc/buddy.c:1457 src/protocols/silc/silc.c:653
 #: src/protocols/silc/util.c:490
 msgid "Excited"
 msgstr "Empolgado"
 
-#: src/protocols/silc/buddy.c:1454 src/protocols/silc/silc.c:654
+#: src/protocols/silc/buddy.c:1459 src/protocols/silc/silc.c:655
 #: src/protocols/silc/util.c:492
 msgid "Anxious"
 msgstr "Ansioso"
 
-#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:982
+#: src/protocols/silc/buddy.c:1491 src/protocols/silc/ops.c:1015
 msgid "User Modes"
 msgstr "Modos do usu叩rio"
 
-#: src/protocols/silc/buddy.c:1495 src/protocols/silc/ops.c:991
+#: src/protocols/silc/buddy.c:1500 src/protocols/silc/ops.c:1024
 msgid "Mood"
 msgstr "Humor"
 
-#: src/protocols/silc/buddy.c:1499 src/protocols/silc/ops.c:997
+#: src/protocols/silc/buddy.c:1504 src/protocols/silc/ops.c:1030
 msgid "Status Text"
 msgstr "Texto de status"
 
-#: src/protocols/silc/buddy.c:1504 src/protocols/silc/ops.c:1003
+#: src/protocols/silc/buddy.c:1509 src/protocols/silc/ops.c:1036
 msgid "Preferred Contact"
 msgstr "Remover contato"
 
-#: src/protocols/silc/buddy.c:1509 src/protocols/silc/ops.c:1008
+#: src/protocols/silc/buddy.c:1514 src/protocols/silc/ops.c:1041
 msgid "Preferred Language"
 msgstr "Linguagem preferida"
 
-#: src/protocols/silc/buddy.c:1514 src/protocols/silc/ops.c:1013
+#: src/protocols/silc/buddy.c:1519 src/protocols/silc/ops.c:1046
 msgid "Device"
 msgstr "Dispositivo"
 
-#: src/protocols/silc/buddy.c:1519 src/protocols/silc/ops.c:1018
-#: src/protocols/silc/silc.c:702 src/protocols/silc/silc.c:704
+#: src/protocols/silc/buddy.c:1524 src/protocols/silc/ops.c:1051
+#: src/protocols/silc/silc.c:703 src/protocols/silc/silc.c:705
 msgid "Timezone"
 msgstr "Fuso hor叩rio"
 
-#: src/protocols/silc/buddy.c:1524 src/protocols/silc/ops.c:1023
+#: src/protocols/silc/buddy.c:1529 src/protocols/silc/ops.c:1056
 msgid "Geolocation"
 msgstr "Localiza巽達o geogr叩fica"
 
-#: src/protocols/silc/buddy.c:1567
+#: src/protocols/silc/buddy.c:1585
 msgid "Reset IM Key"
 msgstr "Redefinir chave de mensagens instant但neas"
 
-#: src/protocols/silc/buddy.c:1572
+#: src/protocols/silc/buddy.c:1590
 msgid "IM with Key Exchange"
 msgstr "Mensagem instant但nea com troca de chaves"
 
-#: src/protocols/silc/buddy.c:1576
+#: src/protocols/silc/buddy.c:1594
 msgid "IM with Password"
 msgstr "Mensagem instant但nea com senha"
 
-#: src/protocols/silc/buddy.c:1588
+#: src/protocols/silc/buddy.c:1606
 msgid "Get Public Key..."
 msgstr "Obter chave p炭blica..."
 
-#: src/protocols/silc/buddy.c:1595 src/protocols/silc/ops.c:1409
+#: src/protocols/silc/buddy.c:1613 src/protocols/silc/ops.c:1442
 msgid "Kill User"
 msgstr "Expulsar usu叩rio do servidor"
 
-#: src/protocols/silc/chat.c:38
+#: src/protocols/silc/buddy.c:1621 src/protocols/silc/chat.c:971
+msgid "Draw On Whiteboard"
+msgstr ""
+
+#: src/protocols/silc/chat.c:39
 msgid "_Passphrase:"
 msgstr "_Frase-senha:"
 
-#: src/protocols/silc/chat.c:79
+#: src/protocols/silc/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "O canal %s n達o existe na rede"
 
-#: src/protocols/silc/chat.c:80 src/protocols/silc/chat.c:172
+#: src/protocols/silc/chat.c:81 src/protocols/silc/chat.c:173
 msgid "Channel Information"
 msgstr "Informa巽探es do canal"
 
-#: src/protocols/silc/chat.c:81
+#: src/protocols/silc/chat.c:82
 msgid "Cannot get channel information"
 msgstr "Imposs鱈vel obter informa巽探es do canal"
 
-#: src/protocols/silc/chat.c:118
+#: src/protocols/silc/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Nome do canal:</b> %s"
 
-#: src/protocols/silc/chat.c:121
+#: src/protocols/silc/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>N炭mero de usu叩rios:</b> %d<br>"
 
-#: src/protocols/silc/chat.c:128
+#: src/protocols/silc/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>Fundador do canal:</b> %s"
 
-#: src/protocols/silc/chat.c:137
+#: src/protocols/silc/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Cifra do canal:</b> %s"
 
-#: src/protocols/silc/chat.c:140
+#: src/protocols/silc/chat.c:141
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>HMAC do canal:</b> %s"
 
-#: src/protocols/silc/chat.c:145
+#: src/protocols/silc/chat.c:146
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>T坦pico do canal:</b><br>%s"
 
-#: src/protocols/silc/chat.c:150
+#: src/protocols/silc/chat.c:151
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Modos do canal:</b> "
 
-#: src/protocols/silc/chat.c:163
+#: src/protocols/silc/chat.c:164
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Impress達o digital da chave do fundador:</b><br>%s"
 
-#: src/protocols/silc/chat.c:164
+#: src/protocols/silc/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Impress達o digital leg鱈vel da chave do fundador:</b><br>%s"
 
-#: src/protocols/silc/chat.c:234
+#: src/protocols/silc/chat.c:235
 msgid "Add Channel Public Key"
 msgstr "Adicionar chave p炭blica do canal"
 
 #. Add new public key
-#: src/protocols/silc/chat.c:289
+#: src/protocols/silc/chat.c:290
 msgid "Open Public Key..."
 msgstr "Abrir chave p炭blica..."
 
-#: src/protocols/silc/chat.c:398
+#: src/protocols/silc/chat.c:399
 msgid "Channel Passphrase"
 msgstr "Frase-senha do canal"
 
-#: src/protocols/silc/chat.c:405
+#: src/protocols/silc/chat.c:406
 msgid "Channel Public Keys List"
 msgstr "Lista de chaves p炭blicas do canal"
 
-#: src/protocols/silc/chat.c:410
+#: src/protocols/silc/chat.c:411
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -9419,124 +9784,124 @@
 "apenas usu叩rios cujas chaves p炭blicas estiverem listadas podem entrar no "
 "canal."
 
-#: src/protocols/silc/chat.c:419 src/protocols/silc/chat.c:420
-#: src/protocols/silc/chat.c:457 src/protocols/silc/chat.c:458
-#: src/protocols/silc/chat.c:891
+#: src/protocols/silc/chat.c:420 src/protocols/silc/chat.c:421
+#: src/protocols/silc/chat.c:458 src/protocols/silc/chat.c:459
+#: src/protocols/silc/chat.c:905
 msgid "Channel Authentication"
 msgstr "Autentica巽達o do canal"
 
-#: src/protocols/silc/chat.c:421 src/protocols/silc/chat.c:459
+#: src/protocols/silc/chat.c:422 src/protocols/silc/chat.c:460
 msgid "Add / Remove"
 msgstr "Adicionar/remover"
 
-#: src/protocols/silc/chat.c:576
+#: src/protocols/silc/chat.c:577
 msgid "Group Name"
 msgstr "nome do grupo"
 
-#: src/protocols/silc/chat.c:580 src/protocols/silc/ops.c:1694
+#: src/protocols/silc/chat.c:581 src/protocols/silc/ops.c:1727
 msgid "Passphrase"
 msgstr "Frase-senha"
 
-#: src/protocols/silc/chat.c:591
+#: src/protocols/silc/chat.c:592
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Por favor digite o nome do grupo privado do canal %s e a frase-senha."
 
-#: src/protocols/silc/chat.c:593
+#: src/protocols/silc/chat.c:594
 msgid "Add Channel Private Group"
 msgstr "Adicionar grupo privado no canal"
 
-#: src/protocols/silc/chat.c:720
+#: src/protocols/silc/chat.c:721
 msgid "User Limit"
 msgstr "Lista de usu叩rios"
 
-#: src/protocols/silc/chat.c:721
+#: src/protocols/silc/chat.c:722
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "Defina o limite de usu叩rios do canal. Defina para zero para redefinir o "
 "limite de usu叩rios."
 
-#: src/protocols/silc/chat.c:863
+#: src/protocols/silc/chat.c:877
 msgid "Get Info"
 msgstr "Ver info"
 
-#: src/protocols/silc/chat.c:871
+#: src/protocols/silc/chat.c:885
 msgid "Invite List"
 msgstr "Lista de convidados"
 
-#: src/protocols/silc/chat.c:876
+#: src/protocols/silc/chat.c:890
 msgid "Ban List"
 msgstr "Lista de bans"
 
-#: src/protocols/silc/chat.c:884
+#: src/protocols/silc/chat.c:898
 msgid "Add Private Group"
 msgstr "Adicionar grupo privado"
 
-#: src/protocols/silc/chat.c:897
+#: src/protocols/silc/chat.c:911
 msgid "Reset Permanent"
 msgstr "Redefinir permanente"
 
-#: src/protocols/silc/chat.c:902
+#: src/protocols/silc/chat.c:916
 msgid "Set Permanent"
 msgstr "Definir permanente"
 
-#: src/protocols/silc/chat.c:910
+#: src/protocols/silc/chat.c:924
 msgid "Set User Limit"
 msgstr "Definir limite de usu叩rios"
 
-#: src/protocols/silc/chat.c:916
+#: src/protocols/silc/chat.c:930
 msgid "Reset Topic Restriction"
 msgstr "Redefinir restri巽達o de t坦pico"
 
-#: src/protocols/silc/chat.c:921
+#: src/protocols/silc/chat.c:935
 msgid "Set Topic Restriction"
 msgstr "Definir restri巽達o de t坦pico"
 
-#: src/protocols/silc/chat.c:928
+#: src/protocols/silc/chat.c:942
 msgid "Reset Private Channel"
 msgstr "Redefinir canal privado"
 
-#: src/protocols/silc/chat.c:933
+#: src/protocols/silc/chat.c:947
 msgid "Set Private Channel"
 msgstr "Definir canal privado"
 
-#: src/protocols/silc/chat.c:940
+#: src/protocols/silc/chat.c:954
 msgid "Reset Secret Channel"
 msgstr "Redefinir canal secreto"
 
-#: src/protocols/silc/chat.c:945
+#: src/protocols/silc/chat.c:959
 msgid "Set Secret Channel"
 msgstr "Definir canal secreto"
 
-#: src/protocols/silc/chat.c:1008
+#: src/protocols/silc/chat.c:1032
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "Voc棚 辿 o fundador do canal em <I>%s</I>"
 
-#: src/protocols/silc/chat.c:1012
+#: src/protocols/silc/chat.c:1036
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "O fundador do canal em <I>%s</I> 辿 <I>%s</I>"
 
-#: src/protocols/silc/chat.c:1071
+#: src/protocols/silc/chat.c:1095
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr "Voc棚 tem que entrar no canal %s antes de poder entrar no grupo privado"
 
-#: src/protocols/silc/chat.c:1073
+#: src/protocols/silc/chat.c:1097
 msgid "Join Private Group"
 msgstr "Entrar em grupo privado"
 
-#: src/protocols/silc/chat.c:1074
+#: src/protocols/silc/chat.c:1098
 msgid "Cannot join private group"
 msgstr "Imposs鱈vel entrar em grupo privado"
 
-#: src/protocols/silc/chat.c:1267 src/protocols/silc/silc.c:917
+#: src/protocols/silc/chat.c:1291 src/protocols/silc/silc.c:918
 msgid "Cannot call command"
 msgstr "N達o foi poss鱈vel chamar comando"
 
-#: src/protocols/silc/chat.c:1268 src/protocols/silc/silc.c:918
+#: src/protocols/silc/chat.c:1292 src/protocols/silc/silc.c:919
 msgid "Unknown command"
 msgstr "Comando desconhecido"
 
@@ -9586,150 +9951,150 @@
 msgid "Cannot send file"
 msgstr "N達o foi poss鱈vel enviar o arquivo"
 
-#: src/protocols/silc/ops.c:341 src/protocols/silc/ops.c:350
-#: src/protocols/silc/ops.c:359
+#: src/protocols/silc/ops.c:374 src/protocols/silc/ops.c:383
+#: src/protocols/silc/ops.c:392
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s mudou o t坦pico de <I>%s</I> para: %s"
 
-#: src/protocols/silc/ops.c:425
+#: src/protocols/silc/ops.c:458
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> definiu os modos do canal <I>%s</I> para: %s"
 
-#: src/protocols/silc/ops.c:429
+#: src/protocols/silc/ops.c:462
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> removeu todos os modos do canal <I>%s</I>"
 
-#: src/protocols/silc/ops.c:462
+#: src/protocols/silc/ops.c:495
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> definiu os modos de <I>%s</I> para: %s"
 
-#: src/protocols/silc/ops.c:470
+#: src/protocols/silc/ops.c:503
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> removeu todos os modos de <I>%s</I>"
 
-#: src/protocols/silc/ops.c:499
+#: src/protocols/silc/ops.c:532
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Voc棚 foi expulso de <I>%s</I> por <I>%s</I>: (%s)"
 
-#: src/protocols/silc/ops.c:529 src/protocols/silc/ops.c:534
-#: src/protocols/silc/ops.c:539
+#: src/protocols/silc/ops.c:562 src/protocols/silc/ops.c:567
+#: src/protocols/silc/ops.c:572
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "Voc棚 foi 'killado' por %s: (%s)"
 
-#: src/protocols/silc/ops.c:560 src/protocols/silc/ops.c:565
-#: src/protocols/silc/ops.c:570
+#: src/protocols/silc/ops.c:593 src/protocols/silc/ops.c:598
+#: src/protocols/silc/ops.c:603
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "'Killado' por %s (%s)"
 
-#: src/protocols/silc/ops.c:616
+#: src/protocols/silc/ops.c:649
 msgid "Server signoff"
 msgstr "Desconex達o do servidor"
 
-#: src/protocols/silc/ops.c:803
+#: src/protocols/silc/ops.c:836
 msgid "Personal Information"
 msgstr "Informa巽達o pessoal"
 
-#: src/protocols/silc/ops.c:826
+#: src/protocols/silc/ops.c:859
 msgid "Birth Day"
 msgstr "Data de nascimento"
 
-#: src/protocols/silc/ops.c:830
+#: src/protocols/silc/ops.c:863
 msgid "Job Title"
 msgstr "T鱈tulo de trabalho"
 
-#: src/protocols/silc/ops.c:834
+#: src/protocols/silc/ops.c:867
 msgid "Job Role"
 msgstr "Fun巽達o de trabalho"
 
-#: src/protocols/silc/ops.c:838
+#: src/protocols/silc/ops.c:871
 msgid "Organization"
 msgstr "Organiza巽達o"
 
-#: src/protocols/silc/ops.c:842
+#: src/protocols/silc/ops.c:875
 msgid "Unit"
 msgstr "Unidade"
 
-#: src/protocols/silc/ops.c:861
+#: src/protocols/silc/ops.c:894
 msgid "EMail"
 msgstr "Email"
 
-#: src/protocols/silc/ops.c:866
+#: src/protocols/silc/ops.c:899
 msgid "Note"
 msgstr "Nota"
 
-#: src/protocols/silc/ops.c:914
+#: src/protocols/silc/ops.c:947
 msgid "Join Chat"
 msgstr "Entrar em um bate-papo"
 
-#: src/protocols/silc/ops.c:1070 src/protocols/silc/ops.c:1140
+#: src/protocols/silc/ops.c:1103 src/protocols/silc/ops.c:1173
 msgid "Public Key Fingerprint"
 msgstr "Impress達o digital da chave p炭blica"
 
-#: src/protocols/silc/ops.c:1071 src/protocols/silc/ops.c:1141
+#: src/protocols/silc/ops.c:1104 src/protocols/silc/ops.c:1174
 msgid "Public Key Babbleprint"
 msgstr "Impress達o digital leg鱈vel da chave p炭blica"
 
-#: src/protocols/silc/ops.c:1084
+#: src/protocols/silc/ops.c:1117
 msgid "More..."
 msgstr "Mais..."
 
-#: src/protocols/silc/ops.c:1155 src/protocols/silc/silc.c:805
+#: src/protocols/silc/ops.c:1188 src/protocols/silc/silc.c:806
 msgid "Detach From Server"
 msgstr "Desconectar do servidor sem sair"
 
-#: src/protocols/silc/ops.c:1155
+#: src/protocols/silc/ops.c:1188
 msgid "Cannot detach"
 msgstr "Imposs鱈vel desconectar sem sair"
 
-#: src/protocols/silc/ops.c:1166
+#: src/protocols/silc/ops.c:1199
 msgid "Cannot set topic"
 msgstr "Imposs鱈vel definir t坦pico"
 
-#: src/protocols/silc/ops.c:1198
+#: src/protocols/silc/ops.c:1231
 msgid "Failed to change nickname"
 msgstr "Falha ao mudar apelido"
 
-#: src/protocols/silc/ops.c:1246
+#: src/protocols/silc/ops.c:1279
 msgid "Roomlist"
 msgstr "Lista de salas"
 
-#: src/protocols/silc/ops.c:1246
+#: src/protocols/silc/ops.c:1279
 msgid "Cannot get room list"
 msgstr "Imposs鱈vel obter lista de salas do servidor"
 
-#: src/protocols/silc/ops.c:1291
+#: src/protocols/silc/ops.c:1324
 msgid "No public key was received"
 msgstr "Nenhuma chave p炭blica foi recebida"
 
-#: src/protocols/silc/ops.c:1304 src/protocols/silc/ops.c:1317
+#: src/protocols/silc/ops.c:1337 src/protocols/silc/ops.c:1350
 msgid "Server Information"
 msgstr "Informa巽探es do servidor"
 
-#: src/protocols/silc/ops.c:1305
+#: src/protocols/silc/ops.c:1338
 msgid "Cannot get server information"
 msgstr "Imposs鱈vel obter informa巽探es do servidor"
 
-#: src/protocols/silc/ops.c:1334 src/protocols/silc/ops.c:1343
+#: src/protocols/silc/ops.c:1367 src/protocols/silc/ops.c:1376
 msgid "Server Statistics"
 msgstr "Estat鱈sticas do servidor"
 
-#: src/protocols/silc/ops.c:1335
+#: src/protocols/silc/ops.c:1368
 msgid "Cannot get server statistics"
 msgstr "Imposs鱈vel obter estat鱈sticas do servidor"
 
-#: src/protocols/silc/ops.c:1344
+#: src/protocols/silc/ops.c:1377
 msgid "No server statistics available"
 msgstr "Estat鱈sticas do servidor indispon鱈veis"
 
-#: src/protocols/silc/ops.c:1366
+#: src/protocols/silc/ops.c:1399
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9764,99 +10129,99 @@
 "Total de operadores de servidor: %d\n"
 "Total de servidores de roteador: %d\n"
 
-#: src/protocols/silc/ops.c:1389
+#: src/protocols/silc/ops.c:1422
 msgid "Network Statistics"
 msgstr "Estat鱈sticas da rede"
 
-#: src/protocols/silc/ops.c:1397 src/protocols/silc/ops.c:1402
+#: src/protocols/silc/ops.c:1430 src/protocols/silc/ops.c:1435
 msgid "Ping"
 msgstr "Ping"
 
-#: src/protocols/silc/ops.c:1397
+#: src/protocols/silc/ops.c:1430
 msgid "Ping failed"
 msgstr "Falha no ping"
 
-#: src/protocols/silc/ops.c:1402
+#: src/protocols/silc/ops.c:1435
 msgid "Ping reply received from server"
 msgstr "O servidor retornou a resposta do ping"
 
-#: src/protocols/silc/ops.c:1410
+#: src/protocols/silc/ops.c:1443
 msgid "Could not kill user"
 msgstr "N達o foi poss鱈vel 'killar' usu叩rio"
 
-#: src/protocols/silc/ops.c:1494
+#: src/protocols/silc/ops.c:1527
 msgid "Error during connecting to SILC Server"
 msgstr "Erro ao conectar no servidor SILC"
 
-#: src/protocols/silc/ops.c:1499
+#: src/protocols/silc/ops.c:1532
 msgid "Key Exchange failed"
 msgstr "Falha na troca de chaves"
 
-#: src/protocols/silc/ops.c:1508
+#: src/protocols/silc/ops.c:1541
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 "Falha ao tentar recuperar sess達o desconectada, mas n達o sa鱈da. Pressione "
 "Reconectar para criar uma nova sess達o."
 
-#: src/protocols/silc/ops.c:1543
+#: src/protocols/silc/ops.c:1576
 msgid "Disconnected by server"
 msgstr "Desconectado pelo servidor"
 
-#: src/protocols/silc/ops.c:1605 src/protocols/silc/ops.c:1652
-#: src/protocols/silc/silc.c:194
+#: src/protocols/silc/ops.c:1638 src/protocols/silc/ops.c:1685
+#: src/protocols/silc/silc.c:195
 msgid "Resuming session"
 msgstr "Recuperando sess達o"
 
-#: src/protocols/silc/ops.c:1607
+#: src/protocols/silc/ops.c:1640
 msgid "Authenticating connection"
 msgstr "Autenticando conex達o"
 
-#: src/protocols/silc/ops.c:1654
+#: src/protocols/silc/ops.c:1687
 msgid "Verifying server public key"
 msgstr "Verificando a chave p炭blica do servidor"
 
-#: src/protocols/silc/ops.c:1695
+#: src/protocols/silc/ops.c:1728
 msgid "Passphrase required"
 msgstr "Frase-senha requerida"
 
-#: src/protocols/silc/ops.c:1724
+#: src/protocols/silc/ops.c:1757
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Falha: Vers探es incompat鱈veis, atualize seu cliente"
 
-#: src/protocols/silc/ops.c:1727
+#: src/protocols/silc/ops.c:1760
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "Falha: O usu叩rio remoto n達o confia/suporta sua chave p炭blica."
 
-#: src/protocols/silc/ops.c:1730
+#: src/protocols/silc/ops.c:1763
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Falha: O usu叩rio remoto n達o suporta o grupo KE proposto."
 
-#: src/protocols/silc/ops.c:1733
+#: src/protocols/silc/ops.c:1766
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Falha: O usu叩rio remoto n達o suporta a cifra proposta"
 
-#: src/protocols/silc/ops.c:1736
+#: src/protocols/silc/ops.c:1769
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Falha: O usu叩rio remoto n達o suporta o PKCS proposto"
 
-#: src/protocols/silc/ops.c:1739
+#: src/protocols/silc/ops.c:1772
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Falha: O usu叩rio remoto n達o suporta a fun巽達o de hash proposta"
 
-#: src/protocols/silc/ops.c:1742
+#: src/protocols/silc/ops.c:1775
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Falha: O usu叩rio remoto n達o suporta o HMAC proposto"
 
-#: src/protocols/silc/ops.c:1744
+#: src/protocols/silc/ops.c:1777
 msgid "Failure: Incorrect signature"
 msgstr "Falha: Assinatura incorreta"
 
-#: src/protocols/silc/ops.c:1746
+#: src/protocols/silc/ops.c:1779
 msgid "Failure: Invalid cookie"
 msgstr "Falha: Cookie inv叩lido"
 
-#: src/protocols/silc/ops.c:1757
+#: src/protocols/silc/ops.c:1790
 msgid "Failure: Authentication failed"
 msgstr "Falha: Autentica巽達o mal sucedida"
 
@@ -9899,36 +10264,36 @@
 msgid "Unsupported public key type"
 msgstr "Tipo de chave p炭blica n達o suportada"
 
-#: src/protocols/silc/silc.c:154
+#: src/protocols/silc/silc.c:155
 msgid "Connection failed"
 msgstr "Falha na conex達o"
 
-#: src/protocols/silc/silc.c:186
+#: src/protocols/silc/silc.c:187
 msgid "Cannot initialize SILC Client connection"
 msgstr "N達o foi poss鱈vel iniciar conex達o do cliente SILC"
 
-#: src/protocols/silc/silc.c:197
+#: src/protocols/silc/silc.c:198
 msgid "Performing key exchange"
 msgstr "Fazendo troca de chaves"
 
-#: src/protocols/silc/silc.c:270
+#: src/protocols/silc/silc.c:271
 msgid "Out of memory"
 msgstr "Sem mem坦ria"
 
 #. Progress
-#: src/protocols/silc/silc.c:309
+#: src/protocols/silc/silc.c:310
 msgid "Connecting to SILC Server"
 msgstr "Conectando ao servidor SILC"
 
-#: src/protocols/silc/silc.c:630
+#: src/protocols/silc/silc.c:631
 msgid "Your Current Mood"
 msgstr "Seu humor atual"
 
-#: src/protocols/silc/silc.c:632
+#: src/protocols/silc/silc.c:633
 msgid "Normal"
 msgstr "Normal"
 
-#: src/protocols/silc/silc.c:657
+#: src/protocols/silc/silc.c:658
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9936,43 +10301,43 @@
 "\n"
 "Seu m辿todo preferido de contatos"
 
-#: src/protocols/silc/silc.c:665 src/protocols/silc/util.c:517
+#: src/protocols/silc/silc.c:666 src/protocols/silc/util.c:517
 msgid "SMS"
 msgstr "SMS"
 
-#: src/protocols/silc/silc.c:667 src/protocols/silc/util.c:519
+#: src/protocols/silc/silc.c:668 src/protocols/silc/util.c:519
 msgid "MMS"
 msgstr "MMS"
 
-#: src/protocols/silc/silc.c:669 src/protocols/silc/util.c:521
+#: src/protocols/silc/silc.c:670 src/protocols/silc/util.c:521
 msgid "Video Conferencing"
 msgstr "Videoconfer棚ncia"
 
-#: src/protocols/silc/silc.c:674
+#: src/protocols/silc/silc.c:675
 msgid "Your Current Status"
 msgstr "Seu status atual"
 
-#: src/protocols/silc/silc.c:681
+#: src/protocols/silc/silc.c:682
 msgid "Online Services"
 msgstr "Servi巽os online"
 
-#: src/protocols/silc/silc.c:684
+#: src/protocols/silc/silc.c:685
 msgid "Let others see what services you are using"
 msgstr "Permitir que os outros vejam os servi巽os que voc棚 est叩 usando"
 
-#: src/protocols/silc/silc.c:690
+#: src/protocols/silc/silc.c:691
 msgid "Let others see what computer you are using"
 msgstr "Permitir que os outros vejam qual computador voc棚 est叩 usando"
 
-#: src/protocols/silc/silc.c:697
+#: src/protocols/silc/silc.c:698
 msgid "Your VCard File"
 msgstr "Seu arquivo VCard"
 
-#: src/protocols/silc/silc.c:710 src/protocols/silc/silc.c:711
+#: src/protocols/silc/silc.c:711 src/protocols/silc/silc.c:712
 msgid "User Online Status Attributes"
 msgstr "Atributos de status online do usu叩rio"
 
-#: src/protocols/silc/silc.c:712
+#: src/protocols/silc/silc.c:713
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
@@ -9982,131 +10347,131 @@
 "e suas informa巽探es pessoais. Por favor preencha as informa巽探es que voc棚 "
 "deseja que seja vista por outros usu叩rios vejam sobre voc棚."
 
-#: src/protocols/silc/silc.c:752 src/protocols/silc/silc.c:758
-#: src/protocols/silc/silc.c:1162
+#: src/protocols/silc/silc.c:753 src/protocols/silc/silc.c:759
+#: src/protocols/silc/silc.c:1163
 msgid "Message of the Day"
 msgstr "Mensagem do dia"
 
-#: src/protocols/silc/silc.c:752
+#: src/protocols/silc/silc.c:753
 msgid "No Message of the Day available"
 msgstr "N達o h叩 mensagem do dia dispon鱈vel"
 
-#: src/protocols/silc/silc.c:753 src/protocols/silc/silc.c:1157
+#: src/protocols/silc/silc.c:754 src/protocols/silc/silc.c:1158
 msgid "There is no Message of the Day associated with this connection"
 msgstr "N達o h叩 mensagem do dia associada com esta conex達o."
 
-#: src/protocols/silc/silc.c:800
+#: src/protocols/silc/silc.c:801
 msgid "Online Status"
 msgstr "Status online"
 
-#: src/protocols/silc/silc.c:809
+#: src/protocols/silc/silc.c:810
 msgid "View Message of the Day"
 msgstr "Ver mensagem do dia"
 
-#: src/protocols/silc/silc.c:882
+#: src/protocols/silc/silc.c:883
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "O usu叩rio <I>%s</I> n達o est叩 presente na rede"
 
-#: src/protocols/silc/silc.c:1033
+#: src/protocols/silc/silc.c:1034
 msgid "Topic too long"
 msgstr "T坦pico muito extenso"
 
-#: src/protocols/silc/silc.c:1114
+#: src/protocols/silc/silc.c:1115
 msgid "You must specify a nick"
 msgstr "Voc棚 precisa especificar um apelido"
 
-#: src/protocols/silc/silc.c:1216
+#: src/protocols/silc/silc.c:1217
 #, c-format
 msgid "channel %s not found"
 msgstr "canal %s n達o encontrado"
 
-#: src/protocols/silc/silc.c:1221
+#: src/protocols/silc/silc.c:1222
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "modos do canal de %s: %s"
 
-#: src/protocols/silc/silc.c:1223
+#: src/protocols/silc/silc.c:1224
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "nenhum modo de canal est叩 definido em %s"
 
-#: src/protocols/silc/silc.c:1236
+#: src/protocols/silc/silc.c:1237
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Falha ao definir cmodes de %s"
 
-#: src/protocols/silc/silc.c:1266
+#: src/protocols/silc/silc.c:1267
 #, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
 msgstr "Comando desconhecido: %s, (Pode ser uma falha do Gaim)"
 
-#: src/protocols/silc/silc.c:1329
+#: src/protocols/silc/silc.c:1330
 msgid "part [channel]:  Leave the chat"
 msgstr "part [canal]:  Sai do bate-papo"
 
-#: src/protocols/silc/silc.c:1333
+#: src/protocols/silc/silc.c:1334
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [canal]:  Sai do bate-papo"
 
-#: src/protocols/silc/silc.c:1337
+#: src/protocols/silc/silc.c:1338
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;novo t坦pico&gt;]:  V棚 ou altera o t坦pico"
 
-#: src/protocols/silc/silc.c:1342
+#: src/protocols/silc/silc.c:1343
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join &lt;canal&gt; [&lt;senha&gt;]:  Entra em um canal nesta rede"
 
-#: src/protocols/silc/silc.c:1346
+#: src/protocols/silc/silc.c:1347
 msgid "list:  List channels on this network"
 msgstr "list:  Lista os canais desta rede"
 
-#: src/protocols/silc/silc.c:1350
+#: src/protocols/silc/silc.c:1351
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;usu叩rio&gt;:  Exibe informa巽探es do usu叩rio"
 
-#: src/protocols/silc/silc.c:1354 src/protocols/zephyr/zephyr.c:2597
+#: src/protocols/silc/silc.c:1355 src/protocols/zephyr/zephyr.c:2597
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 "msg &lt;usu叩rio&gt; &lt;mensagem&gt;:  Manda uma mensagem privada para um "
 "usu叩rio"
 
-#: src/protocols/silc/silc.c:1358
+#: src/protocols/silc/silc.c:1359
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 "query &lt;usu叩rio&gt; [&lt;mensagem&gt;]:  Manda uma mensagem privada para "
 "um usu叩rio"
 
-#: src/protocols/silc/silc.c:1362
+#: src/protocols/silc/silc.c:1363
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  Exibe a mensagem do dia do servidor"
 
-#: src/protocols/silc/silc.c:1366
+#: src/protocols/silc/silc.c:1367
 msgid "detach:  Detach this session"
 msgstr "detach:  Desconecta do servidor sem sair do mesmo"
 
-#: src/protocols/silc/silc.c:1370
+#: src/protocols/silc/silc.c:1371
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [mensagem]:  Desconecta do servidor, com uma mensagem opcional"
 
-#: src/protocols/silc/silc.c:1374
+#: src/protocols/silc/silc.c:1375
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;comando&gt;:  Chama qualquer comando de cliente do SILC"
 
-#: src/protocols/silc/silc.c:1380
+#: src/protocols/silc/silc.c:1381
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr ""
 "kill &lt;usu叩rio&gt; [-pubkey|&lt;motivo&gt;]: Expulsa o usu叩rio do servidor"
 
-#: src/protocols/silc/silc.c:1384
+#: src/protocols/silc/silc.c:1385
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;novo apelido&gt;:  Muda seu apelido"
 
-#: src/protocols/silc/silc.c:1388
+#: src/protocols/silc/silc.c:1389
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;usu叩rio&gt;:  Exibe informa巽探es do usu叩rio"
 
-#: src/protocols/silc/silc.c:1392
+#: src/protocols/silc/silc.c:1393
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -10114,7 +10479,7 @@
 "cmode &lt;canal&gt; [+|-&lt;modos&gt]; [argumentos]: Define ou exibe os "
 "modos do canal."
 
-#: src/protocols/silc/silc.c:1396
+#: src/protocols/silc/silc.c:1397
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -10122,16 +10487,16 @@
 "cumode &lt;usu叩rio|canal&gt; +|-&lt;modos&gt; &lt;usu叩rio&gt;: Muda os modos "
 "do usu叩rio no canal"
 
-#: src/protocols/silc/silc.c:1400
+#: src/protocols/silc/silc.c:1401
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;modos de usu叩rio&gt;: Define seus modos na rede"
 
-#: src/protocols/silc/silc.c:1404
+#: src/protocols/silc/silc.c:1405
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr ""
 "oper &lt;usu叩rio&gt; [-pubkey]: Obt辿m privil辿gios de operador do servidor"
 
-#: src/protocols/silc/silc.c:1408
+#: src/protocols/silc/silc.c:1409
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -10139,38 +10504,38 @@
 "invite &lt;canal&gt; [-|+]&lt;usu叩rio&gt;:  convida um usu叩rio ou adiciona/"
 "remove-o da lista de convites do canal"
 
-#: src/protocols/silc/silc.c:1412
+#: src/protocols/silc/silc.c:1413
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 "kick &lt;canal&gt; &ltusu叩rio&gt; [coment叩rio]:  Expulsa o usu叩rio do canal"
 
-#: src/protocols/silc/silc.c:1416
+#: src/protocols/silc/silc.c:1417
 msgid "info [server]:  View server administrative details"
 msgstr "info [servidor]: Exibe detalhes administrativos do servidor"
 
-#: src/protocols/silc/silc.c:1420
+#: src/protocols/silc/silc.c:1421
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;canal&gt; +|-&lt;usu叩rio&gt;]:  Bane o usu叩rio do canal"
 
-#: src/protocols/silc/silc.c:1424
+#: src/protocols/silc/silc.c:1425
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 "getkey &lt;usu叩rio|servidor&gt;:  Obt辿m a chave p炭blica do servidor ou do "
 "usu叩rio"
 
-#: src/protocols/silc/silc.c:1428
+#: src/protocols/silc/silc.c:1429
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Exibe as estat鱈sticas do servidor e da rede"
 
-#: src/protocols/silc/silc.c:1432
+#: src/protocols/silc/silc.c:1433
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Envia um PING para o servidor conectado"
 
-#: src/protocols/silc/silc.c:1437
+#: src/protocols/silc/silc.c:1438
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;canal&gt;:  Lista os usu叩rios no canal"
 
-#: src/protocols/silc/silc.c:1441
+#: src/protocols/silc/silc.c:1442
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -10178,27 +10543,27 @@
 "names [-count|-ops|-halfops|-voices|-normal] &lt;canal(ais) &gt;:  Lista "
 "usu叩rios espec鱈ficos no(s) canal(ais)"
 
-#: src/protocols/silc/silc.c:1453
+#: src/protocols/silc/silc.c:1454
 msgid "Instant Messages"
 msgstr "Mensagens instant但neas"
 
-#: src/protocols/silc/silc.c:1458
+#: src/protocols/silc/silc.c:1459
 msgid "Digitally sign all IM messages"
 msgstr "Assinar digitalmente todas as mensagens instant但neas"
 
-#: src/protocols/silc/silc.c:1463
+#: src/protocols/silc/silc.c:1464
 msgid "Verify all IM message signatures"
 msgstr "Verificar todas as assinaturas de mensagens instant但neas"
 
-#: src/protocols/silc/silc.c:1466
+#: src/protocols/silc/silc.c:1467
 msgid "Channel Messages"
 msgstr "Mensagens do canal"
 
-#: src/protocols/silc/silc.c:1471
+#: src/protocols/silc/silc.c:1472
 msgid "Digitally sign all channel messages"
 msgstr "Assinar digitalmente todas as mensagens do canal"
 
-#: src/protocols/silc/silc.c:1476
+#: src/protocols/silc/silc.c:1477
 msgid "Verify all channel message signatures"
 msgstr "Verificar todas as assinaturas de mensagens dos canais"
 
@@ -10211,42 +10576,42 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1564
+#: src/protocols/silc/silc.c:1578
 msgid "SILC Protocol Plugin"
 msgstr "Plugin do protocolo SILC"
 
 #. *  description
-#: src/protocols/silc/silc.c:1566
+#: src/protocols/silc/silc.c:1580
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr ""
 "Plugin do protocolo de confer棚ncia segura em tempo-real na internet (Secure "
 "Internet Live Conferencing - SILC)"
 
-#: src/protocols/silc/silc.c:1600
+#: src/protocols/silc/silc.c:1614
 msgid "Public Key file"
 msgstr "Arquivo da chave p炭blica"
 
-#: src/protocols/silc/silc.c:1604
+#: src/protocols/silc/silc.c:1618
 msgid "Private Key file"
 msgstr "Arquivo da chave privada"
 
-#: src/protocols/silc/silc.c:1607
+#: src/protocols/silc/silc.c:1621
 msgid "Public key authentication"
 msgstr "Autentica巽達o via chave p炭blica"
 
-#: src/protocols/silc/silc.c:1611
+#: src/protocols/silc/silc.c:1625
 msgid "Reject watching by other users"
 msgstr "Rejeitar ser monitorado por outros usu叩rios"
 
-#: src/protocols/silc/silc.c:1614
+#: src/protocols/silc/silc.c:1628
 msgid "Block invites"
 msgstr "Bloquear convites"
 
-#: src/protocols/silc/silc.c:1617
+#: src/protocols/silc/silc.c:1631
 msgid "Block IMs without Key Exchange"
 msgstr "Bloquear mensagens instant但neas sem troca de chaves"
 
-#: src/protocols/silc/silc.c:1620
+#: src/protocols/silc/silc.c:1634
 msgid "Reject online status attribute requests"
 msgstr "Rejeitar pedidos de atributos de status online"
 
@@ -10337,6 +10702,61 @@
 msgid "Terminal"
 msgstr "Terminal"
 
+#: src/protocols/simple/simple.c:202
+#, c-format
+msgid ""
+"Could not add the buddy %s because every simple user has to start with "
+"'sip:'."
+msgstr ""
+"N達o foi poss鱈vel adicionar o amigo %s porque cada usu叩rio simple tem que "
+"iniciar com 'sip:'."
+
+#: src/protocols/simple/simple.c:1209
+msgid "Could not create listen socket"
+msgstr "Imposs鱈vel criar socket de escuta"
+
+#: src/protocols/simple/simple.c:1263
+msgid "SIP usernames may not contain whitespaces or @ symbols"
+msgstr "Nomes de usu叩rio do SIP n達o podem conter espa巽os ou s鱈mbolos @"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: src/protocols/simple/simple.c:1408
+msgid "SIP/SIMPLE Protocol Plugin"
+msgstr "Plugin do protocolo SIP/SIMPLE"
+
+#. *  summary
+#: src/protocols/simple/simple.c:1409
+msgid "The SIP/SIMPLE Protocol Plugin"
+msgstr "Plugin do protocolo SIP/SIMPLE"
+
+#. *  description
+#: src/protocols/simple/simple.c:1410
+msgid "Thomas Butter <butter@uni-mannheim.de>"
+msgstr "Thomas Butter <butter@uni-mannheim.de>"
+
+#: src/protocols/simple/simple.c:1431
+msgid "Publish Status (note: everyone may watch you)"
+msgstr "Divulgar status (nota: todo mundo pode monitorar sua presen巽a)"
+
+#: src/protocols/simple/simple.c:1434
+msgid "Use UDP"
+msgstr "Usar UDP"
+
+#: src/protocols/simple/simple.c:1436
+msgid "Use Proxy"
+msgstr "Usar proxy"
+
+#: src/protocols/simple/simple.c:1438
+msgid "Proxy"
+msgstr "Proxy"
+
 #: src/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
@@ -10581,7 +11001,7 @@
 msgid "Your Yahoo! message did not get sent."
 msgstr "Sua mensagem do Yahoo! n達o foi enviada."
 
-#: src/protocols/yahoo/yahoo.c:752 src/protocols/yahoo/yahoo.c:3499
+#: src/protocols/yahoo/yahoo.c:752 src/protocols/yahoo/yahoo.c:3480
 msgid "Buzz!!"
 msgstr "Bzzt!!"
 
@@ -10702,93 +11122,93 @@
 msgstr "Imposs鱈vel ler"
 
 #: src/protocols/yahoo/yahoo.c:2292 src/protocols/yahoo/yahoo.c:2420
-#: src/protocols/yahoo/yahoo.c:2506 src/protocols/yahoo/yahoo.c:2516
+#: src/protocols/yahoo/yahoo.c:2519 src/protocols/yahoo/yahoo.c:2529
 #: src/protocols/yahoo/yahoochat.c:1393 src/protocols/yahoo/yahoochat.c:1460
 #: src/protocols/yahoo/ycht.c:517
 msgid "Connection problem"
 msgstr "Problema na conex達o"
 
-#: src/protocols/yahoo/yahoo.c:2619 src/protocols/yahoo/yahoo.c:3236
+#: src/protocols/yahoo/yahoo.c:2632 src/protocols/yahoo/yahoo.c:3217
 msgid "Not At Home"
 msgstr "Fora de casa"
 
-#: src/protocols/yahoo/yahoo.c:2621 src/protocols/yahoo/yahoo.c:3239
+#: src/protocols/yahoo/yahoo.c:2634 src/protocols/yahoo/yahoo.c:3220
 msgid "Not At Desk"
 msgstr "N達o estou por perto"
 
-#: src/protocols/yahoo/yahoo.c:2623 src/protocols/yahoo/yahoo.c:3242
+#: src/protocols/yahoo/yahoo.c:2636 src/protocols/yahoo/yahoo.c:3223
 msgid "Not In Office"
 msgstr "Fora do escrit坦rio"
 
-#: src/protocols/yahoo/yahoo.c:2627 src/protocols/yahoo/yahoo.c:3248
+#: src/protocols/yahoo/yahoo.c:2640 src/protocols/yahoo/yahoo.c:3229
 msgid "On Vacation"
 msgstr "De f辿rias"
 
-#: src/protocols/yahoo/yahoo.c:2631 src/protocols/yahoo/yahoo.c:3254
+#: src/protocols/yahoo/yahoo.c:2644 src/protocols/yahoo/yahoo.c:3235
 msgid "Stepped Out"
 msgstr "Fui embora"
 
-#: src/protocols/yahoo/yahoo.c:2723 src/protocols/yahoo/yahoo.c:2750
+#: src/protocols/yahoo/yahoo.c:2737 src/protocols/yahoo/yahoo.c:2766
 msgid "Not on server list"
 msgstr "N達o est叩 na lista do servidor"
 
-#: src/protocols/yahoo/yahoo.c:2773 src/protocols/yahoo/yahoo.c:2833
+#: src/protocols/yahoo/yahoo.c:2789 src/protocols/yahoo/yahoo.c:2849
 msgid "Appear Online"
 msgstr "Parecer desconectado"
 
-#: src/protocols/yahoo/yahoo.c:2776 src/protocols/yahoo/yahoo.c:2855
+#: src/protocols/yahoo/yahoo.c:2792 src/protocols/yahoo/yahoo.c:2871
 msgid "Appear Permanently Offline"
 msgstr "Parecer permanentemente desconectado"
 
-#: src/protocols/yahoo/yahoo.c:2794
-msgid "Stealth"
-msgstr "Invis鱈vel"
-
-#: src/protocols/yahoo/yahoo.c:2849
+#: src/protocols/yahoo/yahoo.c:2810
+msgid "Presence"
+msgstr "Presen巽a"
+
+#: src/protocols/yahoo/yahoo.c:2865
 msgid "Don't Appear Permanently Offline"
 msgstr "N達o aparecer permanentemente desconectado"
 
-#: src/protocols/yahoo/yahoo.c:2896
+#: src/protocols/yahoo/yahoo.c:2912
 msgid "Join in Chat"
 msgstr "Entrar em um bate-papo"
 
-#: src/protocols/yahoo/yahoo.c:2901
+#: src/protocols/yahoo/yahoo.c:2917
 msgid "Initiate Conference"
 msgstr "Iniciar confer棚ncia"
 
-#: src/protocols/yahoo/yahoo.c:2926
-msgid "Stealth Settings"
-msgstr "Configura巽達o de invisibilidade"
-
-#: src/protocols/yahoo/yahoo.c:2932
+#: src/protocols/yahoo/yahoo.c:2942
+msgid "Presence Settings"
+msgstr "Configura巽探es de presen巽a"
+
+#: src/protocols/yahoo/yahoo.c:2948
 msgid "Start Doodling"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2963
+#: src/protocols/yahoo/yahoo.c:2979
 msgid "Active which ID?"
 msgstr "Ativar qual ID?"
 
-#: src/protocols/yahoo/yahoo.c:2972
+#: src/protocols/yahoo/yahoo.c:2988
 msgid "Join who in chat?"
 msgstr "Juntar-se a quem no bate-papo?"
 
-#: src/protocols/yahoo/yahoo.c:2982
+#: src/protocols/yahoo/yahoo.c:2998
 msgid "Activate ID..."
 msgstr "Ativar ID..."
 
-#: src/protocols/yahoo/yahoo.c:2986
+#: src/protocols/yahoo/yahoo.c:3002
 msgid "Join user in chat..."
 msgstr "Juntar-se a algu辿m no bate-papo..."
 
-#: src/protocols/yahoo/yahoo.c:3541
+#: src/protocols/yahoo/yahoo.c:3522
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;sala&gt;: Entra numa sala de bate-papo na rede Yahoo"
 
-#: src/protocols/yahoo/yahoo.c:3545
+#: src/protocols/yahoo/yahoo.c:3526
 msgid "buzz: Buzz a contact to get their attention"
 msgstr "buzz: Chama a aten巽達o de um contato atrav辿s de um 'buzz'"
 
-#: src/protocols/yahoo/yahoo.c:3550
+#: src/protocols/yahoo/yahoo.c:3531
 msgid "doodle: Request user to start a Doodle session"
 msgstr ""
 
@@ -10802,55 +11222,105 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3639 src/protocols/yahoo/yahoo.c:3641
+#: src/protocols/yahoo/yahoo.c:3622 src/protocols/yahoo/yahoo.c:3624
 msgid "Yahoo Protocol Plugin"
 msgstr "Plugin do protocolo Yahoo"
 
-#: src/protocols/yahoo/yahoo.c:3658
+#: src/protocols/yahoo/yahoo.c:3641
 msgid "Yahoo Japan"
 msgstr "Yahoo Jap達o"
 
-#: src/protocols/yahoo/yahoo.c:3661
+#: src/protocols/yahoo/yahoo.c:3644
 msgid "Pager host"
 msgstr "Host do pager"
 
-#: src/protocols/yahoo/yahoo.c:3664
+#: src/protocols/yahoo/yahoo.c:3647
 msgid "Japan Pager host"
 msgstr "Host japon棚s do pager"
 
-#: src/protocols/yahoo/yahoo.c:3667
+#: src/protocols/yahoo/yahoo.c:3650
 msgid "Pager port"
 msgstr "Porta do pager"
 
-#: src/protocols/yahoo/yahoo.c:3670
+#: src/protocols/yahoo/yahoo.c:3653
 msgid "File transfer host"
 msgstr "Host da transfer棚ncia de arquivo"
 
-#: src/protocols/yahoo/yahoo.c:3673
+#: src/protocols/yahoo/yahoo.c:3656
 msgid "Japan File transfer host"
 msgstr "Host japon棚s da transfer棚ncia de arquivo"
 
-#: src/protocols/yahoo/yahoo.c:3676
+#: src/protocols/yahoo/yahoo.c:3659
 msgid "File transfer port"
 msgstr "Porta da transfer棚ncia de arquivo"
 
-#: src/protocols/yahoo/yahoo.c:3679
-#, fuzzy
+#: src/protocols/yahoo/yahoo.c:3662
 msgid "Chat Room Locale"
-msgstr "URL da lista de salas de bate-papo"
-
-#: src/protocols/yahoo/yahoo.c:3682
+msgstr "Locale da sala de bate-papo"
+
+#: src/protocols/yahoo/yahoo.c:3665
 msgid "Chat Room List Url"
 msgstr "URL da lista de salas de bate-papo"
 
-#: src/protocols/yahoo/yahoo.c:3685
+#: src/protocols/yahoo/yahoo.c:3668
 msgid "YCHT Host"
 msgstr "Host do YCHT"
 
-#: src/protocols/yahoo/yahoo.c:3688
+#: src/protocols/yahoo/yahoo.c:3671
 msgid "YCHT Port"
 msgstr "Porta do YCHT"
 
+#: src/protocols/yahoo/yahoochat.c:202
+#, c-format
+msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
+msgstr ""
+"%s rejeitou seu convite para uma confer棚ncia na sala \"%s\" porque \"%s\"."
+
+#: src/protocols/yahoo/yahoochat.c:204
+msgid "Invitation Rejected"
+msgstr "Convite rejeitado"
+
+#: src/protocols/yahoo/yahoochat.c:358
+msgid "Failed to join chat"
+msgstr "Falha ao entrar no bate-papo"
+
+#: src/protocols/yahoo/yahoochat.c:358
+msgid "Maybe the room is full?"
+msgstr "Talvez a sala esteja cheia?"
+
+#: src/protocols/yahoo/yahoochat.c:435
+#, c-format
+msgid "You are now chatting in %s."
+msgstr "Voc棚 est叩 conversando em %s."
+
+#: src/protocols/yahoo/yahoochat.c:608
+msgid "Failed to join buddy in chat"
+msgstr "Falha ao ingressar amigo no bate-papo"
+
+#: src/protocols/yahoo/yahoochat.c:609
+msgid "Maybe they're not in a chat?"
+msgstr "Talvez eles n達o estejam em um bate-papo?"
+
+#: src/protocols/yahoo/yahoochat.c:1326
+msgid "Fetching the room list failed."
+msgstr "Falha ao obter a lista de salas."
+
+#: src/protocols/yahoo/yahoochat.c:1379
+msgid "Voices"
+msgstr "Vozes"
+
+#: src/protocols/yahoo/yahoochat.c:1382
+msgid "Webcams"
+msgstr "Webcams"
+
+#: src/protocols/yahoo/yahoochat.c:1393 src/protocols/yahoo/yahoochat.c:1460
+msgid "Unable to fetch room list."
+msgstr "Imposs鱈vel obter lista de salas."
+
+#: src/protocols/yahoo/yahoochat.c:1453
+msgid "User Rooms"
+msgstr "Salas de usu叩rio"
+
 #: src/protocols/yahoo/yahoo_profile.c:672
 #, c-format
 msgid "<b>IP Address:</b> %s<br>"
@@ -10951,57 +11421,6 @@
 msgid "The user's profile is empty."
 msgstr "O perfil do usu叩rio est叩 vazio."
 
-#: src/protocols/yahoo/yahoochat.c:202
-#, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr ""
-"%s rejeitou seu convite para uma confer棚ncia na sala \"%s\" porque \"%s\"."
-
-#: src/protocols/yahoo/yahoochat.c:204
-msgid "Invitation Rejected"
-msgstr "Convite rejeitado"
-
-#: src/protocols/yahoo/yahoochat.c:358
-msgid "Failed to join chat"
-msgstr "Falha ao entrar no bate-papo"
-
-#: src/protocols/yahoo/yahoochat.c:358
-msgid "Maybe the room is full?"
-msgstr "Talvez a sala esteja cheia?"
-
-#: src/protocols/yahoo/yahoochat.c:435
-#, c-format
-msgid "You are now chatting in %s."
-msgstr "Voc棚 est叩 conversando em %s."
-
-#: src/protocols/yahoo/yahoochat.c:608
-msgid "Failed to join buddy in chat"
-msgstr "Falha ao ingressar amigo no bate-papo"
-
-#: src/protocols/yahoo/yahoochat.c:609
-msgid "Maybe they're not in a chat?"
-msgstr "Talvez eles n達o estejam em um bate-papo?"
-
-#: src/protocols/yahoo/yahoochat.c:1326
-msgid "Fetching the room list failed."
-msgstr "Falha ao obter a lista de salas."
-
-#: src/protocols/yahoo/yahoochat.c:1379
-msgid "Voices"
-msgstr "Vozes"
-
-#: src/protocols/yahoo/yahoochat.c:1382
-msgid "Webcams"
-msgstr "Webcams"
-
-#: src/protocols/yahoo/yahoochat.c:1393 src/protocols/yahoo/yahoochat.c:1460
-msgid "Unable to fetch room list."
-msgstr "Imposs鱈vel obter lista de salas."
-
-#: src/protocols/yahoo/yahoochat.c:1453
-msgid "User Rooms"
-msgstr "Salas de usu叩rio"
-
 #: src/protocols/yahoo/ycht.c:400
 msgid "Connection problem with the YCHT server."
 msgstr "Problema na conex達o ao servidor YCHT."
@@ -11165,21 +11584,21 @@
 
 #. XXX: why in the hell are we calling gaim_connection_error() here?
 #. Forbidden
-#: src/proxy.c:1036
+#: src/proxy.c:1097
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
 msgstr "Acesso negado: o servidor proxy n達o permite o tunelamento da porta %d."
 
-#: src/proxy.c:1040
+#: src/proxy.c:1101
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "Erro de conex達o do proxy %d"
 
-#: src/proxy.c:1874
+#: src/proxy.c:1937
 msgid "Invalid proxy settings"
 msgstr "Configura巽探es de proxy inv叩lidas"
 
-#: src/proxy.c:1874
+#: src/proxy.c:1937
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -11194,23 +11613,24 @@
 msgid "Accept"
 msgstr "Aceitar"
 
-#: src/server.c:243
+#: src/savedstatuses.c:404
+msgid "saved statuses"
+msgstr "Status salvos"
+
+#: src/savedstatuses.c:586
+msgid "Hello!"
+msgstr "Ol叩!"
+
+#: src/savedstatuses.c:612
+msgid "I'm not here right now"
+msgstr "No momento, n達o estou aqui"
+
+#: src/server.c:228
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s mudou seu apelido para %s.\n"
 
-#: src/server.c:625
-#, c-format
-msgid "(%d message)"
-msgid_plural "(%d messages)"
-msgstr[0] "(%d mensagem)"
-msgstr[1] "(%d mensagens)"
-
-#: src/server.c:639
-msgid "(1 message)"
-msgstr "(1 mensagem)"
-
-#: src/server.c:859
+#: src/server.c:717
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -11219,19 +11639,18 @@
 "%s convidou %s para sala de bate-papo %s\n"
 "%s"
 
-#: src/server.c:864
+#: src/server.c:722
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "Usu叩rio '%s' convidou %s para sala de bate-papo %s\n"
 
-#: src/server.c:868
+#: src/server.c:726
 msgid "Accept chat invitation?"
 msgstr "Aceitar convite para bate-papo?"
 
 #: src/status.c:153
-#, fuzzy
 msgid "Unset"
-msgstr "Desmarcar"
+msgstr "Redefinir"
 
 #: src/status.c:156
 msgid "Unavailable"
@@ -11247,924 +11666,72 @@
 msgid "%s went away"
 msgstr "%s ficou ausente."
 
-#: src/status.c:1308
+#: src/status.c:1270
 #, c-format
 msgid "%s became idle"
 msgstr "%s tornou-se inativo"
 
-#: src/status.c:1323
+#: src/status.c:1283
 #, c-format
 msgid "%s became unidle"
 msgstr "%s voltou da inatividade"
 
-#: src/status.c:1697
-#, fuzzy
-msgid "Default auto-away"
-msgstr "Auto-away"
-
-#: src/util.c:2121
+#: src/status.c:1354
+#, c-format
+msgid "+++ %s became idle"
+msgstr "+++ %s tornou-se inativo"
+
+#: src/status.c:1356
+#, c-format
+msgid "+++ %s became unidle"
+msgstr "+++ %s voltou da inatividade"
+
+#: src/util.c:2120
 #, c-format
 msgid "Error Reading %s"
 msgstr "Erro ao ler %s"
 
-#: src/util.c:2122
-#, fuzzy, c-format
+#: src/util.c:2121
+#, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
 "the old file has been renamed to %s~."
 msgstr ""
-"Um erro foi encontrado ao processar seu %s. Eles n達o foram carregados, e o "
-"antigo arquivo foi renomeado para %s~."
-
-#: src/util.c:2567
+"Um erro foi encontrado ao ler seu %s. Eles n達o foram carregados, e o antigo "
+"arquivo foi renomeado para %s~."
+
+#: src/util.c:2597
 msgid "Calculating..."
 msgstr "Calculando..."
 
-#: src/util.c:2570
+#: src/util.c:2600
 msgid "Unknown."
 msgstr "Desconhecido."
 
-#: src/util.c:2600
+#: src/util.c:2630
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "segundo"
 msgstr[1] "segundos"
 
-#: src/util.c:2614
+#: src/util.c:2644
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dia"
 msgstr[1] "dias"
 
-#: src/util.c:2622
+#: src/util.c:2652
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hora"
 msgstr[1] "horas"
 
-#: src/util.c:2630
+#: src/util.c:2660
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
 msgstr[1] "minutos"
 
-#: src/util.c:3053
+#: src/util.c:3098
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Erro ao abrir conex達o.\n"
-
-#~ msgid "New..."
-#~ msgstr "Novo..."
-
-#~ msgid "Back"
-#~ msgstr "De volta"
-
-#~ msgid "Tray Icon Configuration"
-#~ msgstr "Configura巽達o do 鱈cone da bandeja"
-
-#~ msgid "_Hide new messages until tray icon is clicked"
-#~ msgstr "_Esconder novas mensagens at辿 que o 鱈cone da bandeja seja clicado"
-
-#~ msgid "Not connected to AIM"
-#~ msgstr "N達o conectado ao AIM"
-
-#~ msgid "No screenname given."
-#~ msgstr "Nenhum nome de usu叩rio fornecido."
-
-#~ msgid "No roomname given."
-#~ msgstr "Nenhum nome de sala fornecido."
-
-#~ msgid "Invalid AIM URI"
-#~ msgstr "URI do AIM inv叩lida"
-
-#~ msgid ""
-#~ "Failed to assign %s to a socket:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Imposs鱈vel associar %s a um socket:\n"
-#~ "%s"
-
-#~ msgid "Unable to open socket"
-#~ msgstr "Imposs鱈vel abrir socket"
-
-#~ msgid "Remote Control"
-#~ msgstr "Controle remoto"
-
-#~ msgid "Provides remote control for gaim applications."
-#~ msgstr "Permite que as aplica巽探es Gaim sejam controladas remotamente."
-
-#~ msgid ""
-#~ "Gives Gaim the ability to be remote-controlled through third-party "
-#~ "applications or through the gaim-remote tool."
-#~ msgstr ""
-#~ "D叩 ao Gaim a possibilidade de ser controlado remotamente atrav辿s de "
-#~ "aplica巽探es de terceiros ou pela ferramenta gaim-remote."
-
-#~ msgid "Show user details"
-#~ msgstr "Mostrar detalhes do usu叩rio"
-
-#~ msgid "_Apply"
-#~ msgstr "_Aplicar"
-
-#~ msgid ""
-#~ "Usage: %s command [OPTIONS] [URI]\n"
-#~ "\n"
-#~ "    COMMANDS:\n"
-#~ "       send                     Send message\n"
-#~ "       uri                      Handle AIM: URI\n"
-#~ "       away                     Popup the away dialog with the default "
-#~ "message\n"
-#~ "       back                     Remove the away dialog\n"
-#~ "       logout                   Log out all accounts\n"
-#~ "       quit                     Close running copy of Gaim\n"
-#~ "\n"
-#~ "    OPTIONS:\n"
-#~ "       -m, --message=MESG       Message to send or show in conversation "
-#~ "window\n"
-#~ "       -t, --to=SCREENNAME      Select a target for command\n"
-#~ "       -p, --protocol=PROTO     Specify protocol to use\n"
-#~ "       -f, --from=SCREENNAME    Specify screen name to use\n"
-#~ "       -s, --session=SESSION    Specify which Gaim session to use\n"
-#~ "       -h, --help [command]     Show help for command\n"
-#~ msgstr ""
-#~ "Utiliza巽達o: %s comando [OP��ES] [URI]\n"
-#~ "\n"
-#~ "    COMANDOS:\n"
-#~ "       send                      Envia uma mensagem\n"
-#~ "       uri                       Lida com URIs AIM:\n"
-#~ "       away                      Exibe a caixa de di叩logo de aus棚ncia com "
-#~ "a mensagem padr達o\n"
-#~ "       back                      Fecha a caixa de di叩logo de aus棚ncia\n"
-#~ "       logout                    Desconecta todas as contas\n"
-#~ "       quit                      Fecha a c坦pia em execu巽達o do Gaim\n"
-#~ "\n"
-#~ "    OP��ES:\n"
-#~ "       -m, --message=MSG         Mensagem a ser exibida ou enviada na "
-#~ "janela de conversa巽達o\n"
-#~ "       -t, --to=SCREENNAME       Escolhe um destino para o comando\n"
-#~ "       -p, --protocol=PROTO      Escolhe o protocolo a ser usado\n"
-#~ "       -f, --from=SCREENNAME     Escolhe o nome de exibi巽達o a ser usado "
-#~ "como remetente\n"
-#~ "       -s, --session=SESSION     Especifica a sess達o do Gaim a ser usada\n"
-#~ "       -h, --help [comando]      Mostra a ajuda do comando\n"
-
-#~ msgid ""
-#~ "Gaim not running (on session %d)\n"
-#~ "Is the \"Remote Control\" plugin loaded?\n"
-#~ msgstr ""
-#~ "O Gaim n達o est叩 rodando (na sess達o %d)\n"
-#~ "O plugin \"Controle Remoto\" est叩 carregado?\n"
-
-#~ msgid ""
-#~ "Insufficient arguments (-t, -f, -p, & -m are all required) or arguments "
-#~ "greater than 9999 chars\n"
-#~ msgstr ""
-#~ "Argumentos insuficientes (-t, -f, -p & -m s達o todos requeridos) ou "
-#~ "argumentos maiores do que 9999 caracteres\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Using AIM: URIs:\n"
-#~ "Sending an IM to a screen name:\n"
-#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
-#~ "In this case, 'Penguin' is the screen name we wish to IM, and 'hello "
-#~ "world'\n"
-#~ "is the message to be sent.  '+' must be used in place of spaces.\n"
-#~ "Please note the quoting used above - if you run this from a shell the "
-#~ "'&'\n"
-#~ "needs to be escaped, or the command will stop at that point.\n"
-#~ "Also,the following will just open a conversation window to a screen "
-#~ "name,\n"
-#~ "with no message:\n"
-#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
-#~ "\n"
-#~ "Joining a chat:\n"
-#~ "\tgaim-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
-#~ "...joins the 'PenguinLounge' chat room.\n"
-#~ "\n"
-#~ "Adding a buddy to your buddy list:\n"
-#~ "\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
-#~ "...prompts you to add 'Penguin' to your buddy list.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Usando URIs AIM: :\n"
-#~ "Enviando uma mensagem instant但nea para um nome de usu叩rio:\n"
-#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
-#~ "Neste caso, 'Penguin' 辿 o nome de usu叩rio que receber叩 a mensagem\n"
-#~ "instant但nea, e 'hello world' 辿 a mensagem a ser enviada. '+' precisa\n"
-#~ "precisa ser usado no lugar dos espa巽os.\n"
-#~ "Favor notar o uso das aspas acima - se voc棚 rodar isso atrav辿s de um "
-#~ "shell\n"
-#~ " o '&' precisa ser escapado, ou o comando ir叩 parar naquele ponto.\n"
-#~ "Al辿m disso, o comando a seguir ir叩 apenas abrir uma janela de conversa "
-#~ "com um nome de usu叩rio, sem nenhuma mensagem:\n"
-#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
-#~ "\n"
-#~ "Entrando no bate-papo:\n"
-#~ "\tgaim-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
-#~ "...entra na sala de bate-papo 'PenguinLounge'.\n"
-#~ "\n"
-#~ "Adicionando um amigo � sua lista:\n"
-#~ "\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
-#~ "...pergunta a voc棚 se deseja adicionar 'Penguin' � sua lista de amigos.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Log out all accounts\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Desconectar todas as contas\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Close running copy of Gaim\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Fecha a c坦pia em execu巽達o do Gaim\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Mark all accounts as \"away\" with the default message.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Marca todas as contas como \"ausente\" com a mensagem padr達o.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Set all accounts as not away.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Remove o estado de aus棚ncia de todas as contas.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Send instant message\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Enviar uma mensagem instant但nea\n"
-
-#~ msgid "/Tools/Pl_ugin Actions"
-#~ msgstr "/Ferramentas/A巽探es de pl_ugins"
-
-#~ msgid "/Tools/_Statuses"
-#~ msgstr "/Ferramentas/_Status"
-
-#~ msgid "Reconnect"
-#~ msgstr "_Reconectar"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
-#~ "\n"
-#~ "%s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">%s foi desconectado.</span>\n"
-#~ "\n"
-#~ "%s\n"
-#~ "%s"
-
-#~ msgid "Reason Unknown."
-#~ msgstr "Raz達o desconhecida."
-
-#~ msgid "_Reconnect"
-#~ msgstr "_Reconectar"
-
-#~ msgid "Reconnect _All"
-#~ msgstr "Reconectar tod_as"
-
-#~ msgid "Time"
-#~ msgstr "Hora"
-
-#~ msgid ""
-#~ "You are about to remove the contact containing %s and %d other buddy from "
-#~ "your buddy list.  Do you want to continue?You are about to remove the "
-#~ "contact containing %s and %d other buddies from your buddy list.  Do you "
-#~ "want to continue?"
-#~ msgstr ""
-#~ "Voc棚 est叩 prestes a remover o contato que cont辿m %s e %d outro amigo da "
-#~ "sua lista de amigos. Deseja continuar?Voc棚 est叩 prestes a remover o "
-#~ "contato que cont辿m %s e %d outros amigos da sua lista de amigos. Deseja "
-#~ "continuar?"
-
-#~ msgid "Show transfer details"
-#~ msgstr "Mostrar detalhes da transfer棚ncia"
-
-#~ msgid "Expander Size"
-#~ msgstr "Tamanho do expansor"
-
-#~ msgid "Size of the expander arrow"
-#~ msgstr "Tamanho da seta do expansor"
-
-#~ msgid "Buddy List Sorting"
-#~ msgstr "Ordena巽達o da lista de amigos"
-
-#~ msgid "_Sorting:"
-#~ msgstr "_Ordena巽達o:"
-
-#~ msgid "Buddy Display"
-#~ msgstr "Exibi巽達o de amigos"
-
-#~ msgid "Show more buddy details"
-#~ msgstr "Mostrar mais detalhes do usu叩rio"
-
-#~ msgid "Message Logs"
-#~ msgstr "Logs de conversas"
-
-#~ msgid "System Logs"
-#~ msgstr "Logs do sistema"
-
-#~ msgid "_Enable system log"
-#~ msgstr "Ativar logs do sist_ema"
-
-#~ msgid "Log when buddies log in/log _out"
-#~ msgstr "Gravar quando amigos conectarem ou de_sconectarem"
-
-#~ msgid "Log when buddies become _idle/un-idle"
-#~ msgstr "Gravar quando amigos ficarem inativos ou voltarem da inatividade"
-
-#~ msgid "Log when buddies go away/come _back"
-#~ msgstr "Gravar quando amigos ficarem ausentes ou voltarem da aus棚ncia"
-
-#~ msgid "Log your own _signons/idleness/awayness"
-#~ msgstr "Gravar suas _pr坦prias conex探es/inatividades/aus棚ncias"
-
-#~ msgid "Idle _Tracking:"
-#~ msgstr "Ina_tividade reportada em rela巽達o a:"
-
-#~ msgid "Gaim usage"
-#~ msgstr "Utiliza巽達o do Gaim"
-
-#~ msgid "X usage"
-#~ msgstr "Utiliza巽達o do X"
-
-#~ msgid "Windows usage"
-#~ msgstr "Utiliza巽達o do Windows"
-
-#~ msgid "Away m_essage:"
-#~ msgstr "M_ensagem de aus棚ncia:"
-
-#~ msgid ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">Written by:</span>\t%s\n"
-#~ "<span weight=\"bold\">Web site:</span>\t\t%s\n"
-#~ "<span weight=\"bold\">File name:</span>\t%s"
-#~ msgstr ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">Escrito por:</span>\t%s\n"
-#~ "<span weight=\"bold\">P叩gina da web:</span>\t\t%s\n"
-#~ "<span weight=\"bold\">Nome do arquivo:</span>\t%s"
-
-#~ msgid ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">Written by:</span>  %s\n"
-#~ "<span weight=\"bold\">URL:</span>  %s\n"
-#~ "<span weight=\"bold\">File name:</span>  %s"
-#~ msgstr ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">Escrito por:</span>  %s\n"
-#~ "<span weight=\"bold\">URL:</span>  %s\n"
-#~ "<span weight=\"bold\">Nome do arquivo:</span>  %s"
-
-#~ msgid "Load"
-#~ msgstr "Carregar"
-
-#~ msgid "Summary"
-#~ msgstr "Sum叩rio"
-
-#~ msgid "Details"
-#~ msgstr "Detalhes"
-
-#~ msgid "Plugins"
-#~ msgstr "Plugins"
-
-#~ msgid "Out of the office"
-#~ msgstr "Fora do escrit坦rio"
-
-#~ msgid "HTML"
-#~ msgstr "HTML"
-
-#~ msgid "Plain text"
-#~ msgstr "Texto puro"
-
-#~ msgid "Slightly less boring default"
-#~ msgstr "Padr達o um pouco menos chato"
-
-#~ msgid "Available for friends only"
-#~ msgstr "Dispon鱈vel apenas para amigos"
-
-#~ msgid "Away for friends only"
-#~ msgstr "Ausente apenas para amigos"
-
-#~ msgid "Invisible for friends only"
-#~ msgstr "Invis鱈vel apenas para amigos"
-
-#~ msgid "Unable to resolve hostname."
-#~ msgstr "Imposs鱈vel resolver endere巽o."
-
-#~ msgid "Error while reading from socket."
-#~ msgstr "Erro ao tentar ler do socket."
-
-#~ msgid "Error while writing to socket."
-#~ msgstr "Erro ao tentar escrever no socket."
-
-#~ msgid "Authentication failed."
-#~ msgstr "Autentica巽達o falhou."
-
-#~ msgid "Unknown Error Code."
-#~ msgstr "C坦digo de erro desconhecido."
-
-#~ msgid "Status: %s"
-#~ msgstr "Status: %s"
-
-#~ msgid "Could not connect"
-#~ msgstr "N達o foi poss鱈vel conectar"
-
-#~ msgid "Reading data"
-#~ msgstr "Lendo dados"
-
-#~ msgid "Balancer handshake"
-#~ msgstr "Negocia巽達o de balanceador"
-
-#~ msgid "Reading server key"
-#~ msgstr "Lendo a chave do servidor"
-
-#~ msgid "Exchanging key hash"
-#~ msgstr "Trocando hash das chaves"
-
-#~ msgid "Critical error in GG library\n"
-#~ msgstr "Erro cr鱈tico na biblioteca do GG\n"
-
-#~ msgid "Unable to ping server"
-#~ msgstr "Imposs鱈vel pingar servidor"
-
-#~ msgid "Send as message"
-#~ msgstr "Enviar como mensagem"
-
-#~ msgid "Looking up GG server"
-#~ msgstr "Procurando servidor GG"
-
-#~ msgid "Invalid Gadu-Gadu UIN specified"
-#~ msgstr "UIN Gadu-Gadu inv叩lido especificado"
-
-#~ msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
-#~ msgstr ""
-#~ "Voc棚 est叩 tentando enviar uma mensagem para um UIN Gadu-Gadu inv叩lido."
-
-#~ msgid "Couldn't get search results"
-#~ msgstr "N達o foi poss鱈vel receber os resultados da procura"
-
-#~ msgid "Birth Year"
-#~ msgstr "Ano de nascimento"
-
-#~ msgid "Sex"
-#~ msgstr "Sexo"
-
-#~ msgid "There is no Buddy List stored on the Gadu-Gadu server."
-#~ msgstr "N達o h叩 lista de amigos gravada neste servidor Gadu-Gadu."
-
-#~ msgid "Couldn't Import Buddy List from Server"
-#~ msgstr "N達o foi poss鱈vel importar lista de amigos do servidor"
-
-#~ msgid "Buddy List successfully transferred to Gadu-Gadu server"
-#~ msgstr "Lista de amigos transferida para o servidor Gadu-Gadu com sucesso"
-
-#~ msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
-#~ msgstr ""
-#~ "N達o foi poss鱈vel transferir a lista de amigos para o servidor Gadu-Gadu"
-
-#~ msgid "Buddy List successfully deleted from Gadu-Gadu server"
-#~ msgstr "Lista de amigos removida do servidor Gadu-Gadu com sucesso"
-
-#~ msgid "Couldn't delete Buddy List from Gadu-Gadu server"
-#~ msgstr "N達o foi poss鱈vel remover a lista de amigos do servidor Gadu-Gadu"
-
-#~ msgid "Password couldn't be changed"
-#~ msgstr "N達o foi poss鱈vel alterar a senha"
-
-#~ msgid "Error communicating with Gadu-Gadu server"
-#~ msgstr "Erro na comunica巽達o com o servidor Gadu-Gadu"
-
-#~ msgid ""
-#~ "Gaim was unable to complete your request due to a problem communicating "
-#~ "with the Gadu-Gadu HTTP server.  Please try again later."
-#~ msgstr ""
-#~ "O Gaim n達o p担de completar sua requisi巽達o devido a um problema ao "
-#~ "comunicar-se com o servidor HTTP do Gadu-Gadu. Por favor tente de novo "
-#~ "mais tarde."
-
-#~ msgid "Unable to import Gadu-Gadu buddy list"
-#~ msgstr "Imposs鱈vel importar lista de amigos Gadu-Gadu"
-
-#~ msgid ""
-#~ "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please "
-#~ "try again later."
-#~ msgstr ""
-#~ "O Gaim n達o p担de conectar ao servidor da lista de amigos do Gadu-Gadu. Por "
-#~ "favor tente de novo mais tarde."
-
-#~ msgid "Couldn't export buddy list"
-#~ msgstr "Imposs鱈vel exportar lista de amigos"
-
-#~ msgid ""
-#~ "Gaim was unable to connect to the buddy list server.  Please try again "
-#~ "later."
-#~ msgstr ""
-#~ "O Gaim n達o p担de conectar ao servidor da lista de amigos do Gadu-Gadu. Por "
-#~ "favor tente de novo mais tarde."
-
-#~ msgid "Unable to delete Gadu-Gadu buddy list"
-#~ msgstr "Imposs鱈vel remover a lista de amigos do Gadu-Gadu"
-
-#~ msgid "Unable to access directory"
-#~ msgstr "Imposs鱈vel acessar o diret坦rio"
-
-#~ msgid ""
-#~ "Gaim was unable to search the Directory because it was unable to connect "
-#~ "to the directory server.  Please try again later."
-#~ msgstr ""
-#~ "O Gaim n達o p担de pesquisar o Diret坦rio porque n達o conseguiu conectar ao "
-#~ "servidor de diret坦rio. Por favor tente de novo mais tarde."
-
-#~ msgid ""
-#~ "Gaim was unable to change your password due to an error connecting to the "
-#~ "Gadu-Gadu server.  Please try again later."
-#~ msgstr ""
-#~ "O Gaim n達o p担de alterar a senha devido a um erro ao conectar ao servidor "
-#~ "Gadu-Gadu. Por favor tente de novo mais tarde."
-
-#~ msgid "Directory Search"
-#~ msgstr "Pesquisa de diret坦rio"
-
-#~ msgid "Unable to access user profile."
-#~ msgstr "Imposs鱈vel acessar perfil do usu叩rio."
-
-#~ msgid ""
-#~ "Gaim was unable to access this user's profile due to an error connecting "
-#~ "to the directory server.  Please try again later."
-#~ msgstr ""
-#~ "O Gaim n達o p担de acessar o perfil deste usu叩rio devido a um erro ao "
-#~ "conectar ao servidor de diret坦rio. Por favor tente de novo mais tarde."
-
-#~ msgid "IRC"
-#~ msgstr "IRC"
-
-#~ msgid "Quit message"
-#~ msgstr "Mensagem de quit"
-
-#~ msgid "Buddy Information for %s"
-#~ msgstr "Informa巽探es adicionais para %s"
-
-#~ msgid "Jabber Profile"
-#~ msgstr "Perfil do Jabber"
-
-#~ msgid "%s has closed the conversation window."
-#~ msgstr "%s fechou a janela de conversa."
-
-#~ msgid "User Properties"
-#~ msgstr "Propriedades do usu叩rio"
-
-#~ msgid "Transfer of file %s timed out."
-#~ msgstr "Tempo esgotado na transfer棚ncia de %s."
-
-#~ msgid ""
-#~ "You missed %hu message from %s because the rate limit has been exceeded."
-#~ "You missed %hu messages from %s because the rate limit has been exceeded."
-#~ msgstr ""
-#~ "Voc棚 perdeu %hu mensagem de %s porque o limite de freq端棚ncia foi excedido."
-#~ "Voc棚 perdeu %hu mensagens de %s porque o limite de freq端棚ncia foi "
-#~ "excedido."
-
-#~ msgid "ICQ Info for %s"
-#~ msgstr "Informa巽探es do ICQ de %s:"
-
-#~ msgid ""
-#~ "Error 0x%04x: Unable to format screen name because the requested screen "
-#~ "name ends in a space."
-#~ msgstr ""
-#~ "Erro 0x%04x: Imposs鱈vel formatar nome de usu叩rio pois o nome requisitado "
-#~ "termina com um espa巽o."
-
-#~ msgid "Basic Profile"
-#~ msgstr "Perfil b叩sico"
-
-#~ msgid "Profile Information"
-#~ msgstr "Informa巽達o do perfil"
-
-#~ msgid "Instant Messagers"
-#~ msgstr "Mensageiros instant但neos"
-
-#~ msgid "AIM"
-#~ msgstr "AIM"
-
-#~ msgid "ICQ UIN"
-#~ msgstr "UIN do ICQ"
-
-#~ msgid "MSN"
-#~ msgstr "MSN"
-
-#~ msgid "Yahoo"
-#~ msgstr "Yahoo"
-
-#~ msgid "I'm From"
-#~ msgstr "Eu sou de(o/a)"
-
-#~ msgid "Set your Trepia profile data."
-#~ msgstr "Definir os dados do seu perfil Trepia."
-
-#~ msgid "Profile"
-#~ msgstr "Perfil"
-
-#~ msgid "Set Profile"
-#~ msgstr "Definir perfil"
-
-#~ msgid "Visit Homepage"
-#~ msgstr "Visitar p叩gina"
-
-#~ msgid "Local Users"
-#~ msgstr "Usu叩rios locais"
-
-#~ msgid "Trepia Protocol Plugin"
-#~ msgstr "Plugin do protocolo Trepia"
-
-#~ msgid "New Status"
-#~ msgstr "Novo status"
-
-#~ msgid "Mail Server"
-#~ msgstr "Servidor de email"
-
-#~ msgid "%s (%d new/%d total)"
-#~ msgstr "%s (%d nova(s)/%d total)"
-
-#~ msgid "Check Mail"
-#~ msgstr "Verificar email"
-
-#~ msgid "Check email every X seconds.\n"
-#~ msgstr "Verifica o email a cada X segundos.\n"
-
-#~ msgid "Auto-login"
-#~ msgstr "Auto-conectar"
-
-#~ msgid "Log Out"
-#~ msgstr "Desconectar"
-
-#~ msgid ""
-#~ "When a new conversation is opened this plugin will insert the last "
-#~ "conversation into the current conversation."
-#~ msgstr ""
-#~ "Quando uma nova conversa 辿 aberta este plugin ir叩 inserir a 炭ltima "
-#~ "conversa na conversa atual."
-
-#~ msgid "Docked _Buddy List is always on top"
-#~ msgstr "_Janela da lista de amigos ancorada sempre no topo"
-
-#~ msgid ""
-#~ "An error was encountered parsing the file containing your buddy list (%"
-#~ "s).  It has not been loaded, and the old file has been renamed to blist."
-#~ "xml~."
-#~ msgstr ""
-#~ "Um erro foi encontrado ao processar o arquivo que cont辿m sua lista de "
-#~ "amigos (%s). Ela n達o foi carregada, e o antigo arquivo foi movido para "
-#~ "blist.xml~."
-
-#~ msgid "Buddy List Error"
-#~ msgstr "Erro da lista de amigos"
-
-#~ msgid "Unable to send messge to %s."
-#~ msgstr "Imposs鱈vel enviar mensagem para %s."
-
-#~ msgid "Show fewer options"
-#~ msgstr "Mostrar menos op巽探es"
-
-#~ msgid "Information"
-#~ msgstr "Informa巽探es"
-
-#~ msgid "/Buddies/_Log Out"
-#~ msgstr "/Amigos/_Desconectar"
-
-#~ msgid "Rename Group"
-#~ msgstr "Renomear grupo"
-
-#~ msgid "New group name"
-#~ msgstr "Novo nome do grupo"
-
-#~ msgid "Please enter a new name for the selected group."
-#~ msgstr "Por favor digite um novo nome para o grupo selecionado."
-
-#~ msgid "%d%%"
-#~ msgstr "%d%%"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Account:</b>"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Conta: </b>"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Idle</b>"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Inativo</b>"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Warned:</b>"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Alertado:</b>"
-
-#~ msgid "Warned (%d%%) "
-#~ msgstr "Alertado (%d%%) "
-
-#~ msgid "/Buddies/Log Out"
-#~ msgstr "/Amigos/Desconectar"
-
-#~ msgid "/Conversation/_Warn..."
-#~ msgstr "/Conversa/_Alertar..."
-
-#~ msgid "/Conversation/Warn..."
-#~ msgstr "/Conversa/Alertar..."
-
-#~ msgid "<main>/Conversation/Close"
-#~ msgstr "<main>/Conversa/Fechar"
-
-#~ msgid "former lead developer"
-#~ msgstr "antigo desenvolvedor principal"
-
-#~ msgid "former maintainer"
-#~ msgstr "antigo mantenedor"
-
-#~ msgid "Chinese"
-#~ msgstr "Chin棚s"
-
-#~ msgid "_Screen name"
-#~ msgstr "_Nome de usu叩rio"
-
-#~ msgid "Warn User"
-#~ msgstr "Alertar usu叩rio"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
-#~ "\n"
-#~ "This will increase %s's warning level and he or she will be subject to "
-#~ "harsher rate limiting.\n"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">Alertar %s?</span>\n"
-#~ "\n"
-#~ "Isto ir叩 aumentar o n鱈vel de alerta de %s e ele ou ela estar叩 sujeito a "
-#~ "um limite de taxa mais r鱈gido.\n"
-
-#~ msgid "Warn _anonymously?"
-#~ msgstr "_Alertar anonimamente?"
-
-#~ msgid "<b>Anonymous warnings are less severe.</b>"
-#~ msgstr "<b>Alertas an担nimos s達o menos severos.</b>"
-
-#~ msgid ""
-#~ "Unable to guess the image type based on the file extension supplied.  "
-#~ "Defaulting to PNG."
-#~ msgstr ""
-#~ "N達o foi poss鱈vel descobrir o tipo de imagem baseando-se na extens達o "
-#~ "fornecida.  O padr達o (PNG) vai ser usado."
-
-#~ msgid "Unable to load preferences"
-#~ msgstr "Imposs鱈vel carregar prefer棚ncias"
-
-#~ msgid ""
-#~ "Gaim was not able to load your preferences because they are stored in an "
-#~ "old format that is no longer used.  Please reconfigure your settings "
-#~ "using the Preferences window."
-#~ msgstr ""
-#~ "O Gaim n達o p担de carregar suas prefer棚ncias porque elas est達o guardadas "
-#~ "num formato que n達o 辿 mais usado. Por favor refa巽a suas configura巽探es "
-#~ "usando a janela de Prefer棚ncias."
-
-#~ msgid "Display"
-#~ msgstr "Exibir"
-
-#~ msgid "Ignore c_olors"
-#~ msgstr "Ignorar c_ores"
-
-#~ msgid "Ignore font _faces"
-#~ msgstr "Ignorar _fontes"
-
-#~ msgid "Ignore font si_zes"
-#~ msgstr "Ignorar _tamanhos de fonte"
-
-#~ msgid "Default Formatting"
-#~ msgstr "Formata巽達o padr達o"
-
-#~ msgid "Window Closing"
-#~ msgstr "Fechar janelas"
-
-#~ msgid "_Escape closes window"
-#~ msgstr "_ESC fecha janela"
-
-#~ msgid "Tab p_lacement:"
-#~ msgstr "Po_si巽達o das abas:"
-
-#~ msgid "New conversation _placement:"
-#~ msgstr "Nova _posi巽達o das conversas:"
-
-#~ msgid "Message Text"
-#~ msgstr "Texto das mensagens"
-
-#~ msgid "Shortcuts"
-#~ msgstr "Atalhos"
-
-#~ msgid "Logging in: %s"
-#~ msgstr "Conectando: %s"
-
-#~ msgid "Hide Operating System"
-#~ msgstr "Esconder sistema operacional"
-
-#~ msgid "The user %s wants to add you to their buddy list."
-#~ msgstr "O usu叩rio %s quer adicionar voc棚 a lista de amigos dele."
-
-#~ msgid "Miscellaneous error"
-#~ msgstr "Erro miscel但neo"
-
-#~ msgid "Initiate Chat"
-#~ msgstr "Iniciar bate-papo"
-
-#~ msgid "Display conversation closed notices"
-#~ msgstr "Mostrar notifica巽探es de 'conversa fechada'"
-
-#~ msgid "Display timeout notices"
-#~ msgstr "Mostrar notifica巽探es de 'tempo limite esgotado'"
-
-#~ msgid "Unable to connect to server"
-#~ msgstr "Imposs鱈vel conectar ao servidor"
-
-#~ msgid "Unknown error when attempting to authorize with MSN login server."
-#~ msgstr "Erro desconhecido ao tentar autorizar com o servidor de login MSN."
-
-#~ msgid "Requesting to send password"
-#~ msgstr "Requisitando o envio da senha"
-
-#~ msgid "Unable to connect to %s server"
-#~ msgstr "Imposs鱈vel conectar ao servidor %s"
-
-#~ msgid "Error writing to %s server"
-#~ msgstr "Erro ao ler do servidor %s"
-
-#~ msgid "Error reading from %s server"
-#~ msgstr "Erro ao ler do servidor %s"
-
-#~ msgid "Received HTTP error. Please report this."
-#~ msgstr "Erro HTTP recebido. Favor reportar esse erro."
-
-#~ msgid "The conversation has become inactive and timed out."
-#~ msgstr "A conversa tornou-se inativa e esgotou o limite de tempo."
-
-#~ msgid ""
-#~ "You were disconnected from the server, because you logged on from a "
-#~ "different location"
-#~ msgstr ""
-#~ "Voc棚 foi desconectado do servidor, pois voc棚 conectou de um local "
-#~ "diferente"
-
-#~ msgid ""
-#~ "You have been disconnected because you have signed on with this screen "
-#~ "name at another location."
-#~ msgstr ""
-#~ "Voc棚 foi desconectado porque conectou-se de outro local com o mesmo nome "
-#~ "de usu叩rio."
-
-#~ msgid "Default SILC Key Pair"
-#~ msgstr "Par de chaves padr達o do SILC"
-
-#~ msgid "SILC Public Key"
-#~ msgstr "Chave p炭blica do SILC"
-
-#~ msgid "SILC Private Key"
-#~ msgstr "Chave privada do SILC"
-
-#~ msgid ""
-#~ "You have been logged off as you have logged in on a different machine or "
-#~ "device."
-#~ msgstr "Voc棚 foi desconectado por conectar em outra m叩quina ou dispositivo."
-
-#~ msgid ""
-#~ "Gaim cannot send files over Yahoo! that are bigger than One Megabyte "
-#~ "(1,048,576 bytes)."
-#~ msgstr ""
-#~ "O Gaim n達o pode enviar arquivos maiores que um megabyte (1.048.576 bytes) "
-#~ "pelo Yahoo!."
-
-#~ msgid "Please enter your password"
-#~ msgstr "Favor digitar sua senha"
-
-#~ msgid ""
-#~ "%s has invited %s to the chat room %s:\n"
-#~ "<b>%s</b>"
-#~ msgstr ""
-#~ "%s convidou %s para a sala de bate-papo %s:\n"
-#~ "<b>%s</b>"
-
-#~ msgid "Saved Statuses Error"
-#~ msgstr "Erro nos status salvos"
--- a/po/sl.po	Mon Dec 05 16:44:46 2005 +0000
+++ b/po/sl.po	Mon Dec 05 18:58:17 2005 +0000
@@ -6,108 +6,68 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: sl\n"
+"Project-Id-Version: Gaim 2.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-27 16:12-0400\n"
-"PO-Revision-Date: 2005-10-09 19:21+0100\n"
+"POT-Creation-Date: 2004-09-08 00:02-0400\n"
+"PO-Revision-Date: 2005-11-28 01:41+0100\n"
 "Last-Translator: Martin Srebotnjak <miles@filmsi.net>\n"
 "Language-Team: LUGOS <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
-"%100==4 ? 3 : 0);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
 "X-Poedit-Language: Slovenian\n"
 "X-Poedit-Country: SLOVENIA\n"
-
-#: plugins/autorecon.c:301
-msgid "Error Message Suppression"
-msgstr "Preziranje sporo�il o napakah"
-
-#: plugins/autorecon.c:305
-msgid "Hide Disconnect Errors"
-msgstr "Skrij napake prekinjanja povezave"
-
-#: plugins/autorecon.c:309
-msgid "Hide Login Errors"
-msgstr "Skrij napake pri prijavljanju"
-
-#: plugins/autorecon.c:313
-msgid "Hide Reconnecting Dialog"
-msgstr "Skrij pogovorno okno ponovnega povezovanja"
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
+"X-Poedit-SourceCharset: iso-8859-1\n"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:337
-msgid "Auto-Reconnect"
-msgstr "Samodejno se ponovno pove転i"
-
-#  *< name
-#  *< version
-#  *  summary
-#  *  description
+#: plugins/ciphertest.c:205
+msgid "Cipher Test"
+msgstr "Preizkusi 邸ifre"
+
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/autorecon.c:340 plugins/autorecon.c:342
-msgid "When you are kicked offline, this reconnects you."
-msgstr "Ko boste brcnjeni, boste samodejno ponovno povezani."
-
-#: plugins/contact_priority.c:84
+#: plugins/ciphertest.c:208
+#: plugins/ciphertest.c:210
+msgid "Tests the ciphers that ship with gaim."
+msgstr "Preizkusi 邸ifre, ki jih prejmete z Gaimom."
+
+#: plugins/contact_priority.c:61
+msgid "Buddy is idle"
+msgstr "Prijatelj je nedejaven"
+
+#: plugins/contact_priority.c:62
+msgid "Buddy is away"
+msgstr "Prijatelj je odsoten"
+
+#: plugins/contact_priority.c:63
+msgid "Buddy is \"extended\" away"
+msgstr "Prijatelj je \"podalj邸ano\" odsoten"
+
+#: plugins/contact_priority.c:64
+msgid "Buddy is offline"
+msgstr "Prijatelj ni na zvezi"
+
+#: plugins/contact_priority.c:86
 msgid "Point values to use when..."
 msgstr "Vrednosti to�k, ko ..."
 
-#: plugins/contact_priority.c:93
-msgid "Buddy is offline:"
-msgstr "Prijatelj ni na zvezi:"
-
-#: plugins/contact_priority.c:107
-msgid "Buddy is away:"
-msgstr "Prijatelj je odsoten:"
+#: plugins/contact_priority.c:114
+msgid "The buddy with the <i>largest score</i> is the buddy who will have priority in the contact.\n"
+msgstr "Prijatelj z <i>najve�jim rezultatom</i> je tisti, ki bo imel prioriteto pri stiku.\n"
 
 #: plugins/contact_priority.c:121
-msgid "Buddy is idle:"
-msgstr "Prijatelj je nedejaven:"
-
-#: plugins/contact_priority.c:135
-msgid "Use last matching buddy"
-msgstr "Uporabi zadnjega ustreznega prijatelja"
-
-#. Explanation
-#: plugins/contact_priority.c:141
-msgid ""
-"The buddy with the lowest score is the buddy who will have priority in the "
-"contact.\n"
-"The default values (offline = 4, away = 2, and idle = 1) will use what used "
-"to be\n"
-"the built-in order: active, idle, away, away + idle, offline."
-msgstr ""
-"Prijatelj z najmanj to�kami ima prednost na seznamu stikov.\n"
-"Privzete vrednosti (ni na zvezi = 4, odsoten = 2 in nedejaven = 1) se "
-"ravnajo po\n"
-"vgrajenem vrstnem redu: dejaven, nedejaven, odsoten, odsoten+nedejaven, ni "
-"na zvezi."
-
-#: plugins/contact_priority.c:144
+msgid "Use last buddy when scores are equal"
+msgstr "Uporabi zadnjega prijatelja, ko so rezultati poravnani"
+
+#: plugins/contact_priority.c:126
 msgid "Point values to use for account..."
 msgstr "Vrednosti to�k za ra�un ..."
 
@@ -117,27 +77,92 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/contact_priority.c:195
+#: plugins/contact_priority.c:177
 msgid "Contact Priority"
 msgstr "Prednost stika"
 
 #. *< name
 #. *< version
 #. *< summary
-#: plugins/contact_priority.c:198
-msgid ""
-"Allows for controlling the values associated with different buddy states."
-msgstr ""
-"Omogo�a nastavljanje vrednosti, povezanih z razli�nimi stanji prijateljev."
+#: plugins/contact_priority.c:180
+msgid "Allows for controlling the values associated with different buddy states."
+msgstr "Omogo�a nastavljanje vrednosti, povezanih z razli�nimi stanji prijateljev."
 
 #. *< description
-#: plugins/contact_priority.c:200
-msgid ""
-"Allows for changing the point values of idle/away/offline states for buddies "
-"in contact priority computations."
-msgstr ""
-"Omogo�a nastavljanje vrednosti to�k pri ra�unanju prednosti stikov za stanja "
-"prijateljev nedejaven/odsoten/ni na zvezi."
+#: plugins/contact_priority.c:182
+msgid "Allows for changing the point values of idle/away/offline states for buddies in contact priority computations."
+msgstr "Omogo�a nastavljanje vrednosti to�k pri ra�unanju prednosti stikov za stanja prijateljev nedejaven/odsoten/ni na zvezi."
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/crazychat/cc_gaim_plugin.c:146
+msgid "Crazychat"
+msgstr "Crazychat"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/crazychat/cc_gaim_plugin.c:149
+msgid "Plugin to establish a Crazychat session."
+msgstr "Vstavek za vzpostavitev seje Crazychat."
+
+#. *  description
+#: plugins/crazychat/cc_gaim_plugin.c:151
+msgid "Uses Gaim to obtain buddy ips to connect for a Crazychat session"
+msgstr "Z Gaimom pridobi prijateljev ips za povezavo v sejo Crazychat"
+
+#. make the network configuration frame
+#: plugins/crazychat/cc_gaim_plugin.c:295
+msgid "Network Configuration"
+msgstr "Nastavitve omre転ja"
+
+#: plugins/crazychat/cc_gaim_plugin.c:307
+msgid "TCP port"
+msgstr "Vrata TCP"
+
+#: plugins/crazychat/cc_gaim_plugin.c:317
+msgid "UDP port"
+msgstr "Vrata UDP"
+
+#. make the feature configuration frame
+#: plugins/crazychat/cc_gaim_plugin.c:329
+msgid "Feature Calibration"
+msgstr "Kalibracija mo転nosti"
+
+#. add enabled / disabled
+#: plugins/crazychat/cc_gaim_plugin.c:345
+#: src/gtkaccount.c:2209
+#: src/gtkplugin.c:403
+msgid "Enabled"
+msgstr "Omogo�en"
+
+#: plugins/crazychat/cc_gaim_plugin.c:350
+msgid "Disabled"
+msgstr "Onemogo�en"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/dbus-example.c:135
+msgid "DBus"
+msgstr "DBus"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: plugins/dbus-example.c:138
+#: plugins/dbus-example.c:140
+msgid "DBus Plugin Example"
+msgstr "Primer vstavka DBus"
 
 #.
 #. *  DEFINES, MACROS & DATA TYPES
@@ -154,40 +179,47 @@
 msgid "Gaim - Away"
 msgstr "Gaim - Odsoten"
 
-#: plugins/docklet/docklet.c:383
-#, fuzzy
+#: plugins/docklet/docklet.c:293
 msgid "Show Buddy List"
-msgstr "Seznam prijateljev"
-
-#: plugins/docklet/docklet.c:390
+msgstr "Poka転i seznam prijateljev"
+
+#: plugins/docklet/docklet.c:300
 msgid "New Message..."
 msgstr "Novo sporo�ilo ..."
 
-#: plugins/docklet/docklet.c:394
+#: plugins/docklet/docklet.c:304
 msgid "Join A Chat..."
 msgstr "Pridru転i se pomenku ..."
 
-#: plugins/docklet/docklet.c:399
-msgid "Mute Sounds"
-msgstr "Uti邸aj zvoke"
-
-#: plugins/docklet/docklet.c:406 src/gtkft.c:691
-#: src/protocols/oscar/oscar.c:8357
+#: plugins/docklet/docklet.c:309
+#: src/gtkaccount.c:2421
+msgid "Accounts"
+msgstr "Ra�uni"
+
+#: plugins/docklet/docklet.c:310
+#: src/gtkplugin.c:374
+msgid "Plugins"
+msgstr "Vstavki"
+
+#: plugins/docklet/docklet.c:311
+#: src/gtkprefs.c:1779
+msgid "Preferences"
+msgstr "Nastavitve"
+
+#: plugins/docklet/docklet.c:315
+#: src/gtkft.c:693
+#: src/protocols/oscar/oscar.c:8391
 msgid "File Transfers"
 msgstr "Prenosi datotek"
 
-#: plugins/docklet/docklet.c:407 src/gtkaccount.c:2422
-msgid "Accounts"
-msgstr "Ra�uni"
-
-#: plugins/docklet/docklet.c:408 src/gtkprefs.c:1763
-msgid "Preferences"
-msgstr "Nastavitve"
+#: plugins/docklet/docklet.c:317
+msgid "Mute Sounds"
+msgstr "Uti邸aj zvoke"
 
 #. TODO: need a submenu to change status, this needs to "link"
 #. * to the status in the buddy list gtkstatusbox
 #.
-#: plugins/docklet/docklet.c:416
+#: plugins/docklet/docklet.c:330
 msgid "Quit"
 msgstr "Kon�aj"
 
@@ -197,44 +229,43 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/docklet/docklet.c:556
+#: plugins/docklet/docklet.c:460
 msgid "System Tray Icon"
 msgstr "Ikona na pladnju"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/docklet/docklet.c:559
+#: plugins/docklet/docklet.c:463
 msgid "Displays an icon for Gaim in the system tray."
 msgstr "Prika転e ikono za Gaim v sistemskem pladnju."
 
 #. *  description
-#: plugins/docklet/docklet.c:561
-msgid ""
-"Displays a system tray icon (in GNOME, KDE or Windows for example) to show "
-"the current status of Gaim, allow fast access to commonly used functions, "
-"and to toggle display of the buddy list or login window. Also allows "
-"messages to be queued until the icon is clicked, similar to ICQ."
-msgstr ""
-"Prika転e ikono v sistemskem pladnju (na primer v GNOME, KDE ali Windows) in s "
-"tem prikazuje trenutno stanje pogovorov ter omogo�a la転ji dostop do pogosto "
-"uporabljanih funkcij. S to ikono lahko tudi skrije oz. prika転e seznam stikov "
-"ali prijavni zaslon. Omogo�a tudi �akanje sporo�il, dokler ne kliknete "
-"ikone, podobno kot pri ICQ."
-
-#: plugins/extplacement.c:79
+#: plugins/docklet/docklet.c:465
+msgid "Displays a system tray icon (in GNOME, KDE or Windows for example) to show the current status of Gaim, allow fast access to commonly used functions, and to toggle display of the buddy list or login window. Also allows messages to be queued until the icon is clicked, similar to ICQ."
+msgstr "Prika転e ikono v sistemskem pladnju (na primer v GNOME, KDE ali Windows) in s tem prikazuje trenutno stanje pogovorov ter omogo�a la転ji dostop do pogosto uporabljanih funkcij. S to ikono lahko tudi skrije oz. prika転e seznam stikov ali prijavni zaslon. Omogo�a tudi �akanje sporo�il, dokler ne kliknete ikone, podobno kot pri ICQ."
+
+#: plugins/docklet/eggtrayicon.c:122
+msgid "Orientation"
+msgstr "Postavitev"
+
+#: plugins/docklet/eggtrayicon.c:123
+msgid "The orientation of the tray."
+msgstr "Postavitev pladnja."
+
+#: plugins/extplacement.c:80
 msgid "By conversation count"
 msgstr "Po 邸tevilu pomenkov"
 
-#: plugins/extplacement.c:100
+#: plugins/extplacement.c:101
 msgid "Conversation Placement"
 msgstr "Postavitev pomenkov"
 
-#: plugins/extplacement.c:105
+#: plugins/extplacement.c:106
 msgid "Number of conversations per window"
 msgstr "�tevilo pomenkov v oknu"
 
-#: plugins/extplacement.c:111
+#: plugins/extplacement.c:112
 msgid "Separate IM and Chat windows when placing by number"
 msgstr "Pri postavitvi po 邸tevilu lo�i okna za klepet in zasebni pomenek"
 
@@ -244,25 +275,21 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/extplacement.c:132
+#: plugins/extplacement.c:133
 msgid "ExtPlacement"
 msgstr "Postavitev"
 
 #. *< name
 #. *< version
-#: plugins/extplacement.c:134
+#: plugins/extplacement.c:135
 msgid "Extra conversation placement options."
 msgstr "Dodatne mo転nosti postavitve pomenka."
 
 #. *< summary
 #. *  description
-#: plugins/extplacement.c:136
-msgid ""
-"Restrict the number of conversations per windows, optionally separating IMs "
-"and Chats"
-msgstr ""
-"Omeji 邸tevilo pomenkov po oknih z mo転nostjo lo�itve oken za klepet in "
-"zasebni pomenek"
+#: plugins/extplacement.c:137
+msgid "Restrict the number of conversations per windows, optionally separating IMs and Chats"
+msgstr "Omeji 邸tevilo pomenkov po oknih z mo転nostjo lo�itve oken za klepet in zasebni pomenek"
 
 #. *< type
 #. *< ui_requirement
@@ -278,7 +305,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/filectl.c:248 plugins/filectl.c:250
+#: plugins/filectl.c:248
+#: plugins/filectl.c:250
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "Omogo�a nadzor nad Gaimom z vna邸anjem ukazov v datoteko."
 
@@ -319,73 +347,91 @@
 "- prika転e vsa prispela sporo�ila �rkovana nazaj;\n"
 "- po邸lje sporo�ilo prijateljem na va邸em seznamu, takoj ko se prijavijo;"
 
-#: plugins/gaimrc.c:40
+#: plugins/gaimrc.c:41
 msgid "Cursor Color"
 msgstr "Barva kazalke"
 
-#: plugins/gaimrc.c:41
-msgid "Secondary Cursor Color"
-msgstr "Drugotna barva kazalke"
-
 #: plugins/gaimrc.c:42
+msgid "Secondary Cursor Color"
+msgstr "Drugotna barva kazalke"
+
+#: plugins/gaimrc.c:43
 msgid "Hyperlink Color"
 msgstr "Barva povezave"
 
-#: plugins/gaimrc.c:53
+#: plugins/gaimrc.c:58
 msgid "GtkTreeView Expander Size"
 msgstr "Velikost raz邸irnika GtkTreeView"
 
-#: plugins/gaimrc.c:72
+#: plugins/gaimrc.c:59
+msgid "GtkTreeView Expander Indentation"
+msgstr "Zamik raz邸irnika GtkTreeView"
+
+#: plugins/gaimrc.c:60
+msgid "GtkTreeView Horizontal Separation"
+msgstr "Vodoravno lo�ilo GtkTreeView"
+
+#: plugins/gaimrc.c:79
 msgid "Conversation Entry"
 msgstr "Vnos pogovora"
 
-#: plugins/gaimrc.c:73
+#: plugins/gaimrc.c:80
 msgid "Conversation History"
 msgstr "Zgodovina pogovora"
 
-#: plugins/gaimrc.c:74
+#: plugins/gaimrc.c:81
 msgid "Log Viewer"
 msgstr "Ogledovalnik dnevnika"
 
-#: plugins/gaimrc.c:75
+#: plugins/gaimrc.c:82
 msgid "Request Dialog"
 msgstr "Pogovorno okno zahteve"
 
-#: plugins/gaimrc.c:76
+#: plugins/gaimrc.c:83
 msgid "Notify Dialog"
 msgstr "Pogovorno okno obvestila"
 
-#: plugins/gaimrc.c:209
+#: plugins/gaimrc.c:286
 #, c-format
 msgid "Select Color for %s"
 msgstr "Nastavite barvo za %s"
 
-#: plugins/gaimrc.c:211
+#: plugins/gaimrc.c:288
 msgid "Select Color"
 msgstr "Nastavite barvo"
 
-#: plugins/gaimrc.c:246
+#: plugins/gaimrc.c:323
 #, c-format
 msgid "Select Font for %s"
 msgstr "Nastavite pisavo za %s"
 
-#: plugins/gaimrc.c:284
+#: plugins/gaimrc.c:361
 msgid "Select Interface Font"
 msgstr "Nastavite pisavo vmesnika"
 
-#: plugins/gaimrc.c:343
+#: plugins/gaimrc.c:421
 msgid "GTK+ Interface Font"
 msgstr "Pisava vmesnika GTK+"
 
-#: plugins/gaimrc.c:362
+#: plugins/gaimrc.c:440
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Tema bli転njic besedila GTK+"
 
-#: plugins/gaimrc.c:460
+#: plugins/gaimrc.c:523
+#, c-format
+msgid "Write a gtkrc file with these settings to %s"
+msgstr "Zapi邸i datoteko gtkrc s temi nastavitvami v %s"
+
+#: plugins/gaimrc.c:531
+msgid "Re-read gtkrc files"
+msgstr "Ponovno preberi datoteke gtkrc"
+
+#: plugins/gaimrc.c:557
 msgid "Gaim GTK+ Theme Control"
 msgstr "Nadzor teme Gaim GTK+"
 
-#: plugins/gaimrc.c:462 plugins/gaimrc.c:463
+#: plugins/gaimrc.c:559
+#: plugins/gaimrc.c:560
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Omogo�a dostop do pogosto uporabljenih nastavitev gtkrc."
 
@@ -442,8 +488,11 @@
 "Povlecite navzgor in zatem desno, da se premaknete k naslednjemu pogovoru."
 
 #: plugins/gevolution/add_buddy_dialog.c:131
-#: plugins/gevolution/assoc-buddy.c:119 src/gtkroomlist.c:572
-#: src/protocols/jabber/jabber.c:638 src/protocols/msn/msn.c:1539
+#: plugins/gevolution/assoc-buddy.c:119
+#: src/gtkplugin.c:413
+#: src/gtkroomlist.c:572
+#: src/protocols/jabber/jabber.c:638
+#: src/protocols/msn/msn.c:1531
 msgid "Name"
 msgstr "Ime"
 
@@ -458,14 +507,16 @@
 
 #. "Search"
 #: plugins/gevolution/add_buddy_dialog.c:471
-#: plugins/gevolution/assoc-buddy.c:353 src/protocols/jabber/buddy.c:1357
-#: src/protocols/oscar/oscar.c:8128
+#: plugins/gevolution/assoc-buddy.c:353
+#: src/protocols/jabber/buddy.c:1357
+#: src/protocols/oscar/oscar.c:8162
 msgid "Search"
 msgstr "I邸�i"
 
 #: plugins/gevolution/add_buddy_dialog.c:552
-#: plugins/gevolution/new_person_dialog.c:306 src/gtkblist.c:4082
-#: src/gtkblist.c:4459
+#: plugins/gevolution/new_person_dialog.c:306
+#: src/gtkblist.c:4348
+#: src/gtkblist.c:4728
 msgid "Group:"
 msgstr "Skupina:"
 
@@ -482,31 +533,38 @@
 
 #. Add the label.
 #: plugins/gevolution/assoc-buddy.c:340
-msgid ""
-"Select a person from your address book to add this buddy to, or create a new "
-"person."
-msgstr ""
-"Izberite osebo iz va邸ega imenika, ki ji 転elite dodati tega prijatelja, ali "
-"ustvarite novo osebo."
+msgid "Select a person from your address book to add this buddy to, or create a new person."
+msgstr "Izberite osebo iz va邸ega imenika, ki ji 転elite dodati tega prijatelja, ali ustvarite novo osebo."
 
 #. Add the expander
 #: plugins/gevolution/assoc-buddy.c:428
-#, fuzzy
 msgid "User _details"
-msgstr "Skrij podrobnosti o uporabniku"
+msgstr "Podrobnosti _o uporabniku"
 
 #. "Associate Buddy" button
 #: plugins/gevolution/assoc-buddy.c:481
 msgid "_Associate Buddy"
 msgstr "Pridru転i prijatelj_a"
 
-#: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:96
-#: src/blist.c:518 src/blist.c:1259 src/blist.c:1480 src/gtkblist.c:3897
+#: plugins/gevolution/eds-utils.c:73
+#: plugins/gevolution/eds-utils.c:86
+#: src/protocols/jabber/jabber.c:982
+#: src/protocols/yahoo/yahoo.c:2797
+msgid "None"
+msgstr "brez"
+
+#: plugins/gevolution/gevo-util.c:64
+#: plugins/gevolution/gevolution.c:96
+#: src/blist.c:518
+#: src/blist.c:1243
+#: src/blist.c:1464
+#: src/gtkblist.c:4163
 #: src/protocols/jabber/roster.c:66
 msgid "Buddies"
 msgstr "Prijatelji"
 
-#: plugins/gevolution/gevolution.c:262 plugins/gevolution/gevolution.c:268
+#: plugins/gevolution/gevolution.c:262
+#: plugins/gevolution/gevolution.c:268
 msgid "Unable to send e-mail"
 msgstr "E-sporo�ila ni bilo mo� poslati."
 
@@ -527,16 +585,19 @@
 msgstr "Po邸lji e-sporo�ilo"
 
 #. Configuration frame
-#: plugins/gevolution/gevolution.c:414
+#: plugins/gevolution/gevolution.c:417
 msgid "Evolution Integration Configuration"
 msgstr "Nastavitve integracije z Evolutionom"
 
 #. Label
-#: plugins/gevolution/gevolution.c:417
+#: plugins/gevolution/gevolution.c:420
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "Izberite vse ra�une, katerim naj se samodejno dodajo prijatelji."
 
-#: plugins/gevolution/gevolution.c:447 plugins/idle.c:111 plugins/idle.c:140
+#: plugins/gevolution/gevolution.c:450
+#: plugins/idle.c:111
+#: plugins/idle.c:146
+#: src/gtkpounce.c:1167
 msgid "Account"
 msgstr "Ra�un"
 
@@ -546,7 +607,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gevolution/gevolution.c:530
+#: plugins/gevolution/gevolution.c:534
 msgid "Evolution Integration"
 msgstr "Integracija z Evolutionom"
 
@@ -554,7 +615,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/gevolution/gevolution.c:533 plugins/gevolution/gevolution.c:535
+#: plugins/gevolution/gevolution.c:537
+#: plugins/gevolution/gevolution.c:539
 msgid "Provides integration with Evolution."
 msgstr "Omogo�a integracijo z Evolutionom."
 
@@ -580,8 +642,10 @@
 msgstr "Dodatne informacije:"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:337 src/gtkaccount.c:412
-#: src/gtkaccount.c:434 src/protocols/oscar/oscar.c:613
+#: plugins/gevolution/new_person_dialog.c:337
+#: src/gtkaccount.c:407
+#: src/gtkaccount.c:429
+#: src/protocols/oscar/oscar.c:615
 msgid "Buddy Icon"
 msgstr "Ikona prijatelja"
 
@@ -597,6 +661,25 @@
 msgid "E-mail:"
 msgstr "E-po邸ta:"
 
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/gtk-signals-test.c:107
+msgid "GTK Signals Test"
+msgstr "Preskus signalov GTK"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: plugins/gtk-signals-test.c:110
+#: plugins/gtk-signals-test.c:112
+msgid "Test to see that all ui signals are working properly."
+msgstr "Preveri pravilnost delovanja vseh signalov uporabni邸kega vmesnika."
+
 #: plugins/history.c:146
 msgid "History Plugin Requires Logging"
 msgstr "Vti�nik za zgodovino zahteva bele転enje v dnevnik"
@@ -605,14 +688,11 @@
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
-"Enabling logs for instant messages and/or chats will activate history for "
-"the same conversation type(s)."
+"Enabling logs for instant messages and/or chats will activate history for the same conversation type(s)."
 msgstr ""
-"Bele転enje v dnevnik lahko omogo�ite v Orodja -> Nastavitve -> Bele転enje v "
-"dnevnik.\n"
+"Bele転enje v dnevnik lahko omogo�ite v Orodja -> Nastavitve -> Bele転enje v dnevnik.\n"
 "\n"
-"Omogo�anje bele転enja v dnevnik za neposredna sporo�ila in/ali klepete "
-"aktivira zgodovino za istovrstne pogovore."
+"Omogo�anje bele転enja v dnevnik za neposredna sporo�ila in/ali klepete aktivira zgodovino za istovrstne pogovore."
 
 #: plugins/history.c:186
 msgid "History"
@@ -624,20 +704,13 @@
 
 #: plugins/history.c:189
 msgid ""
-"When a new conversation is opened this plugin will insert the last "
-"conversation into the current conversation.\n"
+"When a new conversation is opened this plugin will insert the last conversation into the current conversation.\n"
 "\n"
-"The history plugin requires logging be enabled. Logging can be enabled from "
-"Tools -> Preferences -> Logging. Enabling logs for instant messages and/or "
-"chats will activate history for the same conversation type(s)."
+"The history plugin requires logging be enabled. Logging can be enabled from Tools -> Preferences -> Logging. Enabling logs for instant messages and/or chats will activate history for the same conversation type(s)."
 msgstr ""
-"Ko se za�ne nov pomenek, ta vti�nik vstavi zadnji pomenek v trenutni "
-"pomenek.\n"
+"Ko se za�ne nov pomenek, ta vti�nik vstavi zadnji pomenek v trenutni pomenek.\n"
 "\n"
-"Vti�nik zgodovine zahteva omogo�eno bele転enje v dnevnik. Bele転enje v dnevnik "
-"lahko omogo�ite prek izbire Orodja -> Nastavitve -> Bele転enje v dnevnik. "
-"Omogo�anje bele転enja v dnevnike za neposredna sporo�ika in/ali pomenke "
-"aktivira zgodovino za taisto vrsto sporo�anja."
+"Vti�nik zgodovine zahteva omogo�eno bele転enje v dnevnik. Bele転enje v dnevnik lahko omogo�ite prek izbire Orodja -> Nastavitve -> Bele転enje v dnevnik. Omogo�anje bele転enja v dnevnike za neposredna sporo�ika in/ali pomenke aktivira zgodovino za taisto vrsto sporo�anja."
 
 #. *< type
 #. *< ui_requirement
@@ -653,7 +726,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/iconaway.c:104 plugins/iconaway.c:106
+#: plugins/iconaway.c:104
+#: plugins/iconaway.c:106
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "Pomanj邸a seznam prijateljev in pogovorna okna, ko ste odsotni."
 
@@ -661,11 +735,13 @@
 msgid "Minutes"
 msgstr "minut"
 
-#: plugins/idle.c:122 plugins/idle.c:149 plugins/idle.c:215
+#: plugins/idle.c:122
+#: plugins/idle.c:155
+#: plugins/idle.c:221
 msgid "I'dle Mak'er"
 msgstr "NedejavniK"
 
-#: plugins/idle.c:123 plugins/idle.c:181
+#: plugins/idle.c:123
 msgid "Set Account Idle Time"
 msgstr "Nastavi �as nedejavnosti"
 
@@ -673,23 +749,37 @@
 msgid "_Set"
 msgstr "_Nastavi"
 
-#: plugins/idle.c:127 plugins/idle.c:154
+#: plugins/idle.c:127
+#: plugins/idle.c:160
 msgid "_Cancel"
 msgstr "_Prekli�i"
 
-#: plugins/idle.c:150 plugins/idle.c:185
+#: plugins/idle.c:140
+msgid "None of your accounts are idle."
+msgstr "Noben od va邸ih ra�unov ni nedejaven."
+
+#: plugins/idle.c:156
 msgid "Unset Account Idle Time"
 msgstr "Odnastavi �as nedejavnosti"
 
-#: plugins/idle.c:153
+#: plugins/idle.c:159
 msgid "_Unset"
 msgstr "_Odnastavi"
 
-#: plugins/idle.c:190
-msgid "Unset Idle Time For All Idled Accounts"
+#: plugins/idle.c:187
+msgid "Set account idle time"
+msgstr "Nastavi �as nedejavnosti ra�una"
+
+#: plugins/idle.c:191
+msgid "Unset account idle time"
+msgstr "Odnastavi �as nedejavnosti ra�una"
+
+#: plugins/idle.c:196
+msgid "Unset idle time for all idled accounts"
 msgstr "Odnastavi �as odsotnosti za vse ra�une z odsotnostjo"
 
-#: plugins/idle.c:217 plugins/idle.c:218
+#: plugins/idle.c:223
+#: plugins/idle.c:224
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "Omogo�a ro�no nastavitev �asa va邸e odsotnosti"
 
@@ -722,12 +812,8 @@
 
 #. *  description
 #: plugins/ipc-test-client.c:92
-msgid ""
-"Test plugin IPC support, as a client. This locates the server plugin and "
-"calls the commands registered."
-msgstr ""
-"Preskusite vstavek s podporo IPC, kot odjemalec. Poi邸�e stre転ni邸ki vstavek "
-"in kli�e registrirane ukaze."
+msgid "Test plugin IPC support, as a client. This locates the server plugin and calls the commands registered."
+msgstr "Preskusite vstavek s podporo IPC, kot odjemalec. Poi邸�e stre転ni邸ki vstavek in kli�e registrirane ukaze."
 
 #  *< api_version
 #  *< type
@@ -759,8 +845,104 @@
 #. *  description
 #: plugins/ipc-test-server.c:79
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
-msgstr ""
-"Preskusite vstavek s podporo IPC, kot stre転nik. Ukazi IPC bodo registrirani."
+msgstr "Preskusite vstavek s podporo IPC, kot stre転nik. Ukazi IPC bodo registrirani."
+
+#: plugins/log_reader.c:1403
+msgid "User is offline."
+msgstr "Uporabnik ni na zvezi."
+
+#: plugins/log_reader.c:1409
+msgid "Auto-response sent:"
+msgstr "Samodejni odgovor poslan:"
+
+#: plugins/log_reader.c:1419
+#: plugins/log_reader.c:1422
+#, c-format
+msgid "%s logged out."
+msgstr "Uporabnik %s se je odjavil."
+
+#: plugins/log_reader.c:1436
+msgid "One or more messages may have been undeliverable."
+msgstr "Eno ali ve� sporo�il ni mogo�e dostaviti."
+
+#. MSG_SERVER_DISCONNECTING
+#. we have been kicked off =^(
+#: plugins/log_reader.c:1446
+#: src/protocols/napster/napster.c:363
+msgid "You were disconnected from the server."
+msgstr "Povezava s stre転nikom je bila prekinjena."
+
+#: plugins/log_reader.c:1454
+msgid "You are currently disconnected. Messages will not be received unless you are logged in."
+msgstr "Trenutno niste povezani. Sporo�il ne boste mogli prejemati, dokler se ne pove転ete."
+
+#: plugins/log_reader.c:1469
+msgid "Message could not be sent because the maximum length was exceeded."
+msgstr "Sporo�ila ni mogo�e poslati, saj je prese転ena najve�ja dol転ina."
+
+#: plugins/log_reader.c:1474
+msgid "Message could not be sent."
+msgstr "Sporo�ila ni mogo�e poslati."
+
+#. Add general preferences.
+#: plugins/log_reader.c:1908
+msgid "General Log Reading Configuration"
+msgstr "Splo邸ne nastavitve ogledovanja dnevnika"
+
+#: plugins/log_reader.c:1912
+msgid "Fast size calculations"
+msgstr "Hitri izra�uni velikosti"
+
+#: plugins/log_reader.c:1916
+msgid "Use name heuristics"
+msgstr "Uporabi hevristiko imena"
+
+#. Add Log Directory preferences.
+#: plugins/log_reader.c:1922
+msgid "Log Directory"
+msgstr "Imenik dnevnika"
+
+#: plugins/log_reader.c:1926
+msgid "Adium"
+msgstr "Adium"
+
+#: plugins/log_reader.c:1930
+msgid "Fire"
+msgstr "Fire"
+
+#: plugins/log_reader.c:1934
+msgid "Messenger Plus!"
+msgstr "Messenger Plus!"
+
+#: plugins/log_reader.c:1938
+msgid "MSN Messenger"
+msgstr "MSN Messenger"
+
+#: plugins/log_reader.c:1942
+msgid "Trillian"
+msgstr "Trillian"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/log_reader.c:1963
+msgid "Log Reader"
+msgstr "Ogledovalnik dnevnika"
+
+#. *< name
+#. *< version
+#. * summary
+#: plugins/log_reader.c:1967
+msgid "Includes other IM clients' logs in the log viewer."
+msgstr "Vklju�i dnevnike drugih odjemalcev neposrednih sporo�il v ogledovalnik dnevnika."
+
+#. * description
+#: plugins/log_reader.c:1971
+msgid "When viewing logs, this plugin will include logs from other IM clients. Currently, this includes Adium, Fire, Messenger Plus!, MSN Messenger, and Trillian."
+msgstr "Pri ogledovanju dnevnikov bo ta vstavek vklju�il dnevnike drugih odjemalcev neposrednih sporo�il. To trenutno obsega Adium, Fire, Messenger Plus!, MSN Messenger in Trillian."
 
 #: plugins/mailchk.c:160
 msgid "Mail Checker"
@@ -772,78 +954,95 @@
 
 #: plugins/mailchk.c:163
 msgid "Adds a small box to the buddy list that shows if you have new mail."
-msgstr ""
-"Doda majhno 邸katlo na seznam prijateljev, ki prikazuje, ali imate novo po邸to."
+msgstr "Doda majhno 邸katlo na seznam prijateljev, ki prikazuje, ali imate novo po邸to."
+
+#: plugins/mono/loader/mono.c:213
+msgid "Mono Plugin Loader"
+msgstr "Nalaganje vstavkov Mono"
+
+#: plugins/mono/loader/mono.c:215
+#: plugins/mono/loader/mono.c:216
+msgid "Loads .NET plugins with Mono."
+msgstr "Nalo転i vti�nike .NET skupaj z Mono."
+
+#. Configuration frame
+#: plugins/musicmessaging/musicmessaging.c:622
+msgid "Music Messaging Configuration"
+msgstr "Nastavitve glasbe sporo�anja"
+
+#: plugins/musicmessaging/musicmessaging.c:627
+msgid "_Apply"
+msgstr "Upor_abi"
 
 #. ---------- "Notify For" ----------
-#: plugins/notify.c:638
+#: plugins/notify.c:640
 msgid "Notify For"
 msgstr "Obve邸�aj o"
 
-#: plugins/notify.c:642
+#: plugins/notify.c:644
 msgid "_IM windows"
 msgstr "Okna za _neposredne pogovore"
 
-#: plugins/notify.c:649
+#: plugins/notify.c:651
 msgid "C_hat windows"
 msgstr "_Pogovorna okna"
 
-#: plugins/notify.c:656
+#: plugins/notify.c:658
 msgid "_Focused windows"
 msgstr "Okna, ki imajo _fokus"
 
 #  ---------- "Notification Methods" ----------
 #. ---------- "Notification Methods" ----------
-#: plugins/notify.c:664
+#: plugins/notify.c:666
 msgid "Notification Methods"
 msgstr "Na�ini obve邸�anja"
 
-#: plugins/notify.c:671
+#: plugins/notify.c:673
 msgid "Prepend _string into window title:"
 msgstr "Dodaj _obvestilo v naslov okna:"
 
 #. Count method button
-#: plugins/notify.c:690
+#: plugins/notify.c:692
 msgid "Insert c_ount of new messages into window title"
 msgstr "Prika転i _邸tevilo novih sporo�il v naslovu okna"
 
 #. Urgent method button
-#: plugins/notify.c:698
+#: plugins/notify.c:700
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "V upravljalniku oken nastavi namig \"N_UJNO\""
 
 #. Raise window method button
-#: plugins/notify.c:706
+#: plugins/notify.c:708
 msgid "R_aise conversation window"
 msgstr "Povzdigni pogovorna okn_a"
 
 #. ---------- "Notification Removals" ----------
-#: plugins/notify.c:714
+#: plugins/notify.c:716
 msgid "Notification Removal"
 msgstr "Odstranjevanje obvestil"
 
 #. Remove on focus button
-#: plugins/notify.c:719
+#: plugins/notify.c:721
 msgid "Remove when conversation window _gains focus"
 msgstr "Odstrani, ko pogovorno okno _dobi fokus"
 
 #. Remove on click button
-#: plugins/notify.c:726
+#: plugins/notify.c:728
 msgid "Remove when conversation window _receives click"
 msgstr "Odstrani, ko _kliknem na pogovorno okno"
 
 #. Remove on type button
-#: plugins/notify.c:734
+#: plugins/notify.c:736
 msgid "Remove when _typing in conversation window"
 msgstr "Odstrani, ko _tipkam v pogovornem oknu"
 
 #. Remove on message send button
-#: plugins/notify.c:742
+#: plugins/notify.c:744
 msgid "Remove when a _message gets sent"
 msgstr "Odstrani, ko je _sporo�ilo poslano"
 
 #. Remove on conversation switch button
-#: plugins/notify.c:751
+#: plugins/notify.c:753
 msgid "Remove on switch to conversation ta_b"
 msgstr "Odstrani ob zamenjavi _zavihka pomenka"
 
@@ -853,7 +1052,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:841
+#: plugins/notify.c:843
 msgid "Message Notification"
 msgstr "Obvestila o sporo�ilih"
 
@@ -861,7 +1060,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/notify.c:844 plugins/notify.c:846
+#: plugins/notify.c:846
+#: plugins/notify.c:848
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Ponuja mnoge na�ine opozarjanja na nova sporo�ila."
 
@@ -878,26 +1078,22 @@
 #. *< name
 #. *< version
 #. *< summary
-#: plugins/perl/perl.c:589 plugins/perl/perl.c:590
+#: plugins/perl/perl.c:589
+#: plugins/perl/perl.c:590
 msgid "Provides support for loading perl plugins."
 msgstr "Doda podporo nalaganja vstavkov v programskem jeziku perl."
 
-#: plugins/raw.c:151
+#: plugins/raw.c:175
 msgid "Raw"
 msgstr "Direktno"
 
-#: plugins/raw.c:153
+#: plugins/raw.c:177
 msgid "Lets you send raw input to text-based protocols."
 msgstr "Omogo�a neposreden vnos v protokole."
 
-#: plugins/raw.c:154
-msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
-"'Enter' in the entry box to send. Watch the debug window."
-msgstr ""
-"Omogo�a po邸iljanje golih ukazov za protokole, ki temeljijo na besedilu "
-"(Jabber, MSN, IRC, TOC). Pritisnite 'Enter' za po邸iljanje in opazujte kodno "
-"okno."
+#: plugins/raw.c:178
+msgid "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit 'Enter' in the entry box to send. Watch the debug window."
+msgstr "Omogo�a po邸iljanje golih ukazov za protokole, ki temeljijo na besedilu (Jabber, MSN, IRC, TOC). Pritisnite 'Enter' za po邸iljanje in opazujte kodno okno."
 
 #: plugins/relnot.c:63
 #, c-format
@@ -915,14 +1111,11 @@
 
 #: plugins/relnot.c:74
 #, c-format
-msgid ""
-"You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
-"\">http://gaim.sourceforge.net</a>."
-msgstr ""
-"Razli�ico %s lahko najdete na:<br><a href=\"http://gaim.sourceforge.net/"
-"\">http://gaim.sourceforge.net</a>."
-
-#: plugins/relnot.c:78 plugins/relnot.c:79
+msgid "You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/\">http://gaim.sourceforge.net</a>."
+msgstr "Razli�ico %s lahko najdete na:<br><a href=\"http://gaim.sourceforge.net/\">http://gaim.sourceforge.net</a>."
+
+#: plugins/relnot.c:78
+#: plugins/relnot.c:79
 msgid "New Version Available"
 msgstr "Na voljo je nova razli�ica."
 
@@ -945,12 +1138,8 @@
 
 #. *  description
 #: plugins/relnot.c:142
-msgid ""
-"Checks periodically for new releases and notifies the user with the "
-"ChangeLog."
-msgstr ""
-"Preverja, ali je na voljo nova razli�ica in uporabika seznanja z dnevnikom "
-"sprememb."
+msgid "Checks periodically for new releases and notifies the user with the ChangeLog."
+msgstr "Preverja, ali je na voljo nova razli�ica in uporabika seznanja z dnevnikom sprememb."
 
 #. *< type
 #. *< ui_requirement
@@ -958,7 +1147,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:730
+#: plugins/signals-test.c:715
 msgid "Signals Test"
 msgstr "Preskus signalov"
 
@@ -966,7 +1155,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/signals-test.c:733 plugins/signals-test.c:735
+#: plugins/signals-test.c:718
+#: plugins/signals-test.c:720
 msgid "Test to see that all signals are working properly."
 msgstr "Preveri vse ukaze, da se prepri�a o delujo�i povezavi."
 
@@ -984,58 +1174,59 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/simple.c:37 plugins/simple.c:39
+#: plugins/simple.c:37
+#: plugins/simple.c:39
 msgid "Tests to see that most things are working."
 msgstr "Preveri ve�ino stvari, �e delujejo."
 
-#: plugins/spellchk.c:1788
+#: plugins/spellchk.c:1800
 msgid "Duplicate Correction"
 msgstr "Popravek dvojnikov"
 
-#: plugins/spellchk.c:1789
+#: plugins/spellchk.c:1801
 msgid "The specified word already exists in the correction list."
 msgstr "Navedena beseda 転e obstaja v seznamu popravkov."
 
-#: plugins/spellchk.c:1948
+#: plugins/spellchk.c:1981
 msgid "Text Replacements"
 msgstr "Zamenjave besedila"
 
-#: plugins/spellchk.c:1972
+#: plugins/spellchk.c:2005
 msgid "You type"
 msgstr "Vi napi邸ete"
 
-#: plugins/spellchk.c:1984
+#: plugins/spellchk.c:2017
 msgid "You send"
 msgstr "Jaz po邸ljem"
 
-#: plugins/spellchk.c:1996
+#: plugins/spellchk.c:2029
 msgid "Whole words only"
 msgstr "Samo cele besede"
 
-#: plugins/spellchk.c:2022
+#: plugins/spellchk.c:2055
 msgid "Add a new text replacement"
 msgstr "Dodaj novo zamenjavo"
 
-#: plugins/spellchk.c:2032
+#: plugins/spellchk.c:2065
 msgid "You _type:"
 msgstr "Vi _napi邸ete:"
 
-#: plugins/spellchk.c:2048
+#: plugins/spellchk.c:2081
 msgid "You _send:"
 msgstr "Jaz _po邸ljem:"
 
-#: plugins/spellchk.c:2060
+#: plugins/spellchk.c:2093
 msgid "Only replace _whole words"
 msgstr "Zamenjaj le _cele besede"
 
-#: plugins/spellchk.c:2097
+#: plugins/spellchk.c:2130
 msgid "Text replacement"
 msgstr "Zamenjava besedila"
 
-#: plugins/spellchk.c:2099 plugins/spellchk.c:2100
+#: plugins/spellchk.c:2132
+#: plugins/spellchk.c:2133
 msgid "Replaces text in outgoing messages according to user-defined rules."
-msgstr ""
-"Zamenja besedilo v odhodnih sporo�ilih po uporabni邸ko dolo�enih pravilih."
+msgstr "Zamenja besedilo v odhodnih sporo�ilih po uporabni邸ko dolo�enih pravilih."
 
 #. *< type
 #. *< ui_requirement
@@ -1051,7 +1242,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl-gnutls.c:230 plugins/ssl/ssl-gnutls.c:232
+#: plugins/ssl/ssl-gnutls.c:230
+#: plugins/ssl/ssl-gnutls.c:232
 msgid "Provides SSL support through GNUTLS."
 msgstr "Omogo�a podporo SSL preko GNUTLS."
 
@@ -1069,7 +1261,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl-nss.c:322 plugins/ssl/ssl-nss.c:324
+#: plugins/ssl/ssl-nss.c:322
+#: plugins/ssl/ssl-nss.c:324
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Omogo�a podporo SSL preko Mozilla NSS."
 
@@ -1087,21 +1280,22 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl.c:97 plugins/ssl/ssl.c:99
+#: plugins/ssl/ssl.c:97
+#: plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Omogo�a ovojnico za knji転nice s podporo SSL."
 
-#: plugins/statenotify.c:42
-#, c-format
-msgid "%s has gone away."
-msgstr "%s je zdaj odsoten."
-
 #: plugins/statenotify.c:49
 #, c-format
 msgid "%s is no longer away."
 msgstr "%s se je vrnil."
 
-#: plugins/statenotify.c:56
+#: plugins/statenotify.c:51
+#, c-format
+msgid "%s has gone away."
+msgstr "%s je zdaj odsoten."
+
+#: plugins/statenotify.c:61
 #, c-format
 msgid "%s has become idle."
 msgstr "%s je nedejaven."
@@ -1111,25 +1305,39 @@
 msgid "%s is no longer idle."
 msgstr "%s ni ve� nedejaven."
 
-#: plugins/statenotify.c:74
+#: plugins/statenotify.c:72
+#, c-format
+msgid "%s has signed on."
+msgstr "%s se je prijavil(a)."
+
+#: plugins/statenotify.c:79
+#, c-format
+msgid "%s has signed off."
+msgstr "%s se je odjavil(a)."
+
+#: plugins/statenotify.c:90
 msgid "Notify When"
 msgstr "Obvesti, ko"
 
-#: plugins/statenotify.c:77
+#: plugins/statenotify.c:93
 msgid "Buddy Goes _Away"
 msgstr "postaja prijatelj _odsoten"
 
-#: plugins/statenotify.c:80
+#: plugins/statenotify.c:96
 msgid "Buddy Goes _Idle"
 msgstr "postaja prijatelj _nedejaven"
 
+#: plugins/statenotify.c:99
+msgid "Buddy _Signs On/Off"
+msgstr "Prijatelj _se prijavi/odjavi"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/statenotify.c:120
+#: plugins/statenotify.c:139
 msgid "Buddy State Notification"
 msgstr "Obvestila o stanjih prijateljev"
 
@@ -1137,17 +1345,17 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/statenotify.c:123 plugins/statenotify.c:126
-msgid ""
-"Notifies in a conversation window when a buddy goes or returns from away or "
-"idle."
+#: plugins/statenotify.c:142
+#: plugins/statenotify.c:145
+msgid "Notifies in a conversation window when a buddy goes or returns from away or idle."
 msgstr "V pogovornem oknu obve邸�a o spremembah stanja va邸ih prijateljev."
 
 #: plugins/tcl/tcl.c:363
 msgid "Tcl Plugin Loader"
 msgstr "Nalaganje vstavkov Tcl"
 
-#: plugins/tcl/tcl.c:365 plugins/tcl/tcl.c:366
+#: plugins/tcl/tcl.c:365
+#: plugins/tcl/tcl.c:366
 msgid "Provides support for loading Tcl plugins"
 msgstr "Omogo�a podporo nalaganja vstavkov Tcl"
 
@@ -1157,7 +1365,8 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ticker/ticker.c:75 plugins/ticker/ticker.c:326
+#: plugins/ticker/ticker.c:75
+#: plugins/ticker/ticker.c:324
 msgid "Buddy Ticker"
 msgstr "Nabodalo prijateljev"
 
@@ -1165,19 +1374,20 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ticker/ticker.c:329 plugins/ticker/ticker.c:331
+#: plugins/ticker/ticker.c:327
+#: plugins/ticker/ticker.c:329
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Vodoravna ina�ica seznama prijateljev."
 
-#: plugins/timestamp.c:202
+#: plugins/timestamp.c:198
 msgid "iChat Timestamp"
 msgstr "�asovni 転ig iChat"
 
-#: plugins/timestamp.c:209
+#: plugins/timestamp.c:205
 msgid "Delay"
 msgstr "Zakasnitev"
 
-#: plugins/timestamp.c:216
+#: plugins/timestamp.c:212
 msgid "minutes."
 msgstr "minut."
 
@@ -1187,7 +1397,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/timestamp.c:279
+#: plugins/timestamp.c:275
 msgid "Timestamp"
 msgstr "�as nastanka"
 
@@ -1195,7 +1405,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/timestamp.c:282 plugins/timestamp.c:284
+#: plugins/timestamp.c:278
+#: plugins/timestamp.c:280
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "Doda �ase nastanka vsakih N minut v slogu iChata."
 
@@ -1260,13 +1471,11 @@
 #. *  description
 #: plugins/win32/transparency/win2ktrans.c:662
 msgid ""
-"This plugin enables variable alpha transparency on conversation windows and "
-"the buddy list.\n"
+"This plugin enables variable alpha transparency on conversation windows and the buddy list.\n"
 "\n"
 "* Note: This plugin requires Win2000 or greater."
 msgstr ""
-"Ta vstavek omogo�i poljubno nastavitev prosojnosti pogovornih oken in "
-"seznama prijateljev.\n"
+"Ta vstavek omogo�i poljubno nastavitev prosojnosti pogovornih oken in seznama prijateljev.\n"
 "\n"
 "* Pozor: Ta vstavek zahteva Win2000 ali novej邸e."
 
@@ -1284,7 +1493,8 @@
 msgstr "Za_転eni Gaim ob zagonu Windows"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:405 src/gtkblist.c:3173
+#: plugins/win32/winprefs/winprefs.c:405
+#: src/gtkblist.c:3418
 msgid "Buddy List"
 msgstr "Seznam prijateljev"
 
@@ -1297,11 +1507,14 @@
 msgid "_Keep Buddy List window on top:"
 msgstr "_Ohrani seznam prijateljev nad vrhu:"
 
-#: plugins/win32/winprefs/winprefs.c:412 src/gtkprefs.c:1657
+#: plugins/win32/winprefs/winprefs.c:412
+#: src/gtkprefs.c:816
+#: src/gtkprefs.c:1665
 msgid "Never"
 msgstr "nikoli"
 
 #: plugins/win32/winprefs/winprefs.c:413
+#: src/gtkprefs.c:818
 msgid "Always"
 msgstr "vedno"
 
@@ -1311,8 +1524,9 @@
 msgstr "samo, ko je lepljiv"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:419 src/gtkprefs.c:803
-#: src/gtkprefs.c:1727
+#: plugins/win32/winprefs/winprefs.c:419
+#: src/gtkprefs.c:812
+#: src/gtkprefs.c:1743
 msgid "Conversations"
 msgstr "Pogovori"
 
@@ -1329,136 +1543,203 @@
 msgstr "Nastavitve, specifi�ne za okolje Windows."
 
 #: plugins/win32/winprefs/winprefs.c:446
-msgid ""
-"Provides options specific to Windows Gaim, such as buddy list docking and "
-"conversation flashing."
+msgid "Provides options specific to Windows Gaim, such as buddy list docking and conversation flashing."
 msgstr "Ponuja posebne nastavitve okenskega Gaima, kot je "
 
 #: src/account.c:773
 msgid "accounts"
 msgstr "Ra�uni"
 
-#: src/account.c:915
+#: src/account.c:923
 msgid "Password is required to sign on."
 msgstr "Za prijavo je potrebno geslo."
 
-#: src/account.c:940
+#: src/account.c:948
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Vpi邸ite geslo za %s (%s)"
 
-#: src/account.c:947
+#: src/account.c:955
 msgid "Enter Password"
 msgstr "Vnesi geslo"
 
-#: src/account.c:952
+#: src/account.c:960
 msgid "Save password"
 msgstr "Shrani geslo"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:960 src/account.c:1116 src/gtkdialogs.c:507
-#: src/gtkdialogs.c:648 src/gtkdialogs.c:704 src/gtkrequest.c:261
-#: src/protocols/gg/gg.c:434 src/protocols/gg/gg.c:581
-#: src/protocols/gg/gg.c:1498 src/protocols/jabber/jabber.c:1162
-#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:250
-#: src/protocols/msn/msn.c:265 src/protocols/msn/msn.c:280
-#: src/protocols/msn/msn.c:295 src/protocols/oscar/oscar.c:2894
-#: src/protocols/oscar/oscar.c:4404 src/protocols/oscar/oscar.c:4485
-#: src/protocols/oscar/oscar.c:7857 src/protocols/oscar/oscar.c:7982
-#: src/protocols/oscar/oscar.c:8007 src/protocols/oscar/oscar.c:8059
-#: src/protocols/sametime/sametime.c:4585 src/protocols/silc/buddy.c:465
-#: src/protocols/silc/buddy.c:1137 src/protocols/silc/chat.c:422
-#: src/protocols/silc/chat.c:460 src/protocols/silc/chat.c:723
-#: src/protocols/silc/ops.c:1083 src/protocols/silc/ops.c:1696
-#: src/protocols/silc/silc.c:716 src/protocols/yahoo/yahoo.c:2965
-#: src/protocols/yahoo/yahoo.c:2974 src/request.h:1331
+#: src/account.c:968
+#: src/account.c:1123
+#: src/gtkdialogs.c:527
+#: src/gtkdialogs.c:664
+#: src/gtkdialogs.c:732
+#: src/gtkrequest.c:287
+#: src/protocols/gg/gg.c:463
+#: src/protocols/gg/gg.c:604
+#: src/protocols/gg/gg.c:741
+#: src/protocols/jabber/jabber.c:1162
+#: src/protocols/jabber/xdata.c:337
+#: src/protocols/msn/msn.c:250
+#: src/protocols/msn/msn.c:265
+#: src/protocols/msn/msn.c:280
+#: src/protocols/msn/msn.c:295
+#: src/protocols/oscar/oscar.c:2904
+#: src/protocols/oscar/oscar.c:4406
+#: src/protocols/oscar/oscar.c:4487
+#: src/protocols/oscar/oscar.c:7891
+#: src/protocols/oscar/oscar.c:8016
+#: src/protocols/oscar/oscar.c:8041
+#: src/protocols/oscar/oscar.c:8093
+#: src/protocols/sametime/sametime.c:5255
+#: src/protocols/silc/buddy.c:466
+#: src/protocols/silc/buddy.c:1147
+#: src/protocols/silc/chat.c:423
+#: src/protocols/silc/chat.c:461
+#: src/protocols/silc/chat.c:724
+#: src/protocols/silc/ops.c:1297
+#: src/protocols/silc/ops.c:1910
+#: src/protocols/silc/silc.c:739
+#: src/protocols/yahoo/yahoo.c:2982
+#: src/protocols/yahoo/yahoo.c:2991
+#: src/request.h:1331
 msgid "OK"
 msgstr "V redu"
 
-#: src/account.c:961 src/account.c:1117 src/account.c:1155
-#: src/gtkaccount.c:2124 src/gtkaccount.c:2575 src/gtkblist.c:4497
-#: src/gtkdialogs.c:508 src/gtkdialogs.c:649 src/gtkdialogs.c:705
-#: src/gtkdialogs.c:724 src/gtkdialogs.c:746 src/gtkdialogs.c:766
-#: src/gtkdialogs.c:810 src/gtkdialogs.c:872 src/gtkdialogs.c:914
-#: src/gtkdialogs.c:956 src/gtkimhtmltoolbar.c:419 src/gtkprivacy.c:595
-#: src/gtkprivacy.c:608 src/gtkprivacy.c:633 src/gtkprivacy.c:644
-#: src/gtkrequest.c:262 src/gtksavedstatuses.c:221 src/protocols/gg/gg.c:435
-#: src/protocols/gg/gg.c:582 src/protocols/gg/gg.c:656
-#: src/protocols/gg/gg.c:1499 src/protocols/jabber/buddy.c:573
-#: src/protocols/jabber/buddy.c:1358 src/protocols/jabber/buddy.c:1392
-#: src/protocols/jabber/chat.c:780 src/protocols/jabber/jabber.c:707
-#: src/protocols/jabber/jabber.c:1163 src/protocols/jabber/xdata.c:338
-#: src/protocols/msn/msn.c:251 src/protocols/msn/msn.c:266
-#: src/protocols/msn/msn.c:281 src/protocols/msn/msn.c:296
-#: src/protocols/msn/msn.c:313 src/protocols/oscar/oscar.c:1596
-#: src/protocols/oscar/oscar.c:2895 src/protocols/oscar/oscar.c:4362
-#: src/protocols/oscar/oscar.c:4405 src/protocols/oscar/oscar.c:4442
-#: src/protocols/oscar/oscar.c:4486 src/protocols/oscar/oscar.c:7858
-#: src/protocols/oscar/oscar.c:7983 src/protocols/oscar/oscar.c:8008
-#: src/protocols/oscar/oscar.c:8060 src/protocols/oscar/oscar.c:8129
-#: src/protocols/sametime/sametime.c:4586 src/protocols/silc/buddy.c:466
-#: src/protocols/silc/buddy.c:1042 src/protocols/silc/buddy.c:1138
-#: src/protocols/silc/chat.c:595 src/protocols/silc/chat.c:724
-#: src/protocols/silc/ops.c:1697 src/protocols/silc/silc.c:717
-#: src/protocols/yahoo/yahoo.c:2966 src/protocols/yahoo/yahoo.c:2975
-#: src/request.h:1331 src/request.h:1341
+#: src/account.c:969
+#: src/account.c:1124
+#: src/account.c:1162
+#: src/gtkaccount.c:2129
+#: src/gtkaccount.c:2574
+#: src/gtkblist.c:4766
+#: src/gtkdialogs.c:528
+#: src/gtkdialogs.c:665
+#: src/gtkdialogs.c:733
+#: src/gtkdialogs.c:752
+#: src/gtkdialogs.c:774
+#: src/gtkdialogs.c:794
+#: src/gtkdialogs.c:838
+#: src/gtkdialogs.c:900
+#: src/gtkdialogs.c:942
+#: src/gtkdialogs.c:984
+#: src/gtkimhtmltoolbar.c:419
+#: src/gtkpounce.c:1000
+#: src/gtkprivacy.c:595
+#: src/gtkprivacy.c:608
+#: src/gtkprivacy.c:633
+#: src/gtkprivacy.c:644
+#: src/gtkrequest.c:288
+#: src/gtksavedstatuses.c:299
+#: src/protocols/gg/gg.c:464
+#: src/protocols/gg/gg.c:605
+#: src/protocols/gg/gg.c:742
+#: src/protocols/gg/gg.c:831
+#: src/protocols/jabber/buddy.c:573
+#: src/protocols/jabber/buddy.c:1358
+#: src/protocols/jabber/buddy.c:1392
+#: src/protocols/jabber/chat.c:780
+#: src/protocols/jabber/jabber.c:707
+#: src/protocols/jabber/jabber.c:1163
+#: src/protocols/jabber/xdata.c:338
+#: src/protocols/msn/msn.c:251
+#: src/protocols/msn/msn.c:266
+#: src/protocols/msn/msn.c:281
+#: src/protocols/msn/msn.c:296
+#: src/protocols/msn/msn.c:313
+#: src/protocols/oscar/oscar.c:1598
+#: src/protocols/oscar/oscar.c:2905
+#: src/protocols/oscar/oscar.c:4364
+#: src/protocols/oscar/oscar.c:4407
+#: src/protocols/oscar/oscar.c:4444
+#: src/protocols/oscar/oscar.c:4488
+#: src/protocols/oscar/oscar.c:7892
+#: src/protocols/oscar/oscar.c:8017
+#: src/protocols/oscar/oscar.c:8042
+#: src/protocols/oscar/oscar.c:8094
+#: src/protocols/oscar/oscar.c:8163
+#: src/protocols/sametime/sametime.c:3382
+#: src/protocols/sametime/sametime.c:3465
+#: src/protocols/sametime/sametime.c:3592
+#: src/protocols/sametime/sametime.c:4369
+#: src/protocols/sametime/sametime.c:5256
+#: src/protocols/sametime/sametime.c:5472
+#: src/protocols/sametime/sametime.c:5558
+#: src/protocols/silc/buddy.c:467
+#: src/protocols/silc/buddy.c:1043
+#: src/protocols/silc/buddy.c:1148
+#: src/protocols/silc/chat.c:596
+#: src/protocols/silc/chat.c:725
+#: src/protocols/silc/ops.c:1911
+#: src/protocols/silc/silc.c:740
+#: src/protocols/silc/silc.c:945
+#: src/protocols/yahoo/yahoo.c:2983
+#: src/protocols/yahoo/yahoo.c:2992
+#: src/request.h:1331
+#: src/request.h:1341
 msgid "Cancel"
 msgstr "Prekli�i"
 
-#: src/account.c:986 src/connection.c:96
+#: src/account.c:994
+#: src/connection.c:96
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Manjka vstavek za protokol %s"
 
-#: src/account.c:988 src/connection.c:99
+#: src/account.c:996
+#: src/connection.c:99
 msgid "Connection Error"
 msgstr "Napaka na povezavi"
 
-#: src/account.c:1052 src/protocols/gg/gg.c:470
+#: src/account.c:1060
+#: src/protocols/gg/gg.c:645
 #: src/protocols/jabber/jabber.c:1115
 msgid "New passwords do not match."
 msgstr "Novi gesli se ne ujemata."
 
-#: src/account.c:1061
+#: src/account.c:1069
 msgid "Fill out all fields completely."
 msgstr "Izpolnite vsa polja."
 
-#: src/account.c:1085
-msgid "Original password"
-msgstr "Obstoje�e geslo"
-
 #: src/account.c:1092
-msgid "New password"
-msgstr "Novo geslo"
+msgid "Original password"
+msgstr "Obstoje�e geslo"
 
 #: src/account.c:1099
+msgid "New password"
+msgstr "Novo geslo"
+
+#: src/account.c:1106
 msgid "New password (again)"
 msgstr "Novo geslo (ponovno)"
 
-#: src/account.c:1105
+#: src/account.c:1112
 #, c-format
 msgid "Change password for %s"
 msgstr "Spremeni geslo za %s"
 
-#: src/account.c:1113
+#: src/account.c:1120
 msgid "Please enter your current password and your new password."
 msgstr "Vnesite svoje obstoje�e in novo geslo."
 
-#: src/account.c:1146
+#: src/account.c:1153
 #, c-format
 msgid "Change user information for %s"
 msgstr "Spremeni podatke za uporabika %s"
 
-#: src/account.c:1154 src/gtkdebug.c:684 src/gtkrequest.c:268
+#: src/account.c:1161
+#: src/gtkdebug.c:684
+#: src/gtkrequest.c:294
 #: src/protocols/jabber/buddy.c:572
 msgid "Save"
 msgstr "Shrani"
 
-#: src/account.c:1641 src/gtkft.c:156 src/protocols/jabber/buddy.c:633
-#: src/protocols/jabber/buddy.c:1083 src/protocols/jabber/buddy.c:1100
-#: src/protocols/novell/novell.c:2837
+#: src/account.c:1656
+#: src/gtkft.c:157
+#: src/protocols/jabber/buddy.c:633
+#: src/protocols/jabber/buddy.c:1083
+#: src/protocols/jabber/buddy.c:1100
+#: src/protocols/novell/novell.c:2863
 msgid "Unknown"
 msgstr "Neznan"
 
@@ -1466,32 +1747,20 @@
 msgid "buddy list"
 msgstr "Seznam prijateljev"
 
-#: src/blist.c:1162
+#: src/blist.c:1146
 msgid "Chats"
 msgstr "Pomenki"
 
-#: src/blist.c:1863
-#, c-format
-msgid ""
-"%d buddy from group %s was not removed because its account was not logged "
-"in.  This buddy and the group were not removed.\n"
-msgid_plural ""
-"%d buddies from group %s were not removed because their accounts were not "
-"logged in.  These buddies and the group were not removed.\n"
-msgstr[0] ""
-"%d prijateljev iz skupine %s ni bilo odstranjenih, ker njihovi ra�uni niso "
-"bili prijavljeni.  Ti prijatelji in skupine niso bili odstranjeni.\n"
-msgstr[1] ""
-"%d prijatelj iz skupine %s ni bil odstranjen, ker njegov ra�un ni bil "
-"prijavljen.  Ta prijatelj in skupina nista bila odstranjena.\n"
-msgstr[2] ""
-"%d prijatelja iz skupine %s nista bila odstranjena, ker njuna ra�una nista "
-"bila prijavljena.  Ta prijatelja in skupina niso bili odstranjeni.\n"
-msgstr[3] ""
-"%d prijatelji iz skupine %s niso bili odstranjeni, ker njihovi ra�uni niso "
-"bili prijavljeni.  Ti prijatelji in skupine niso bili odstranjeni.\n"
-
-#: src/blist.c:1872
+#: src/blist.c:1845
+#, c-format
+msgid "%d buddy from group %s was not removed because its account was not logged in.  This buddy and the group were not removed.\n"
+msgid_plural "%d buddies from group %s were not removed because their accounts were not logged in.  These buddies and the group were not removed.\n"
+msgstr[0] "%d prijateljev iz skupine %s ni bilo odstranjenih, ker njihovi ra�uni niso bili prijavljeni.  Ti prijatelji in skupine niso bili odstranjeni.\n"
+msgstr[1] "%d prijatelj iz skupine %s ni bil odstranjen, ker njegov ra�un ni bil prijavljen.  Ta prijatelj in skupina nista bila odstranjena.\n"
+msgstr[2] "%d prijatelja iz skupine %s nista bila odstranjena, ker njuna ra�una nista bila prijavljena.  Ta prijatelja in skupina niso bili odstranjeni.\n"
+msgstr[3] "%d prijatelji iz skupine %s niso bili odstranjeni, ker njihovi ra�uni niso bili prijavljeni.  Ti prijatelji in skupine niso bili odstranjeni.\n"
+
+#: src/blist.c:1854
 msgid "Group not removed"
 msgstr "Skupina ni bila odstranjena"
 
@@ -1499,64 +1768,81 @@
 msgid "Registration Error"
 msgstr "Napaka pri prijavi"
 
-#: src/conversation.c:205
+#: src/connection.c:280
+#, c-format
+msgid "+++ %s signed on"
+msgstr "+++ %s se je prijavil(a)"
+
+#: src/connection.c:323
+#, c-format
+msgid "+++ %s signed off"
+msgstr "+++ %s se je odjavil(a)"
+
+#: src/conversation.c:196
 msgid "Unable to send message: The message is too large."
 msgstr "Sporo�ila ni bilo mo� poslati, ker je preveliko."
 
-#: src/conversation.c:208 src/conversation.c:221
+#: src/conversation.c:199
+#: src/conversation.c:212
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "Ni bilo mo� poslati sporo�ila k %s."
 
-#: src/conversation.c:209
+#: src/conversation.c:200
 msgid "The message is too large."
 msgstr "Sporo�ilo je preveliko."
 
-#: src/conversation.c:218
+#: src/conversation.c:209
 msgid "Unable to send message."
 msgstr "Sporo�ila ni bilo mo� poslati."
 
-#: src/conversation.c:1497
+#: src/conversation.c:1503
 #, c-format
 msgid "%s entered the room."
 msgstr "%s se nam pridru転uje."
 
-#: src/conversation.c:1499
+#: src/conversation.c:1505
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] se nam pridru転uje."
 
-#: src/conversation.c:1598
+#: src/conversation.c:1608
 #, c-format
 msgid "You are now known as %s"
 msgstr "Zdaj ste znani kot %s"
 
-#: src/conversation.c:1613
+#: src/conversation.c:1623
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s je zdaj poznan kot %s"
 
-#: src/conversation.c:1669
+#: src/conversation.c:1679
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s nas je zapustil (%s)."
 
-#: src/conversation.c:1671
+#: src/conversation.c:1681
 #, c-format
 msgid "%s left the room."
 msgstr "%s nas je zapustil."
 
-#: src/conversation.c:1748
+#: src/conversation.c:1758
 #, c-format
 msgid "(+%d more)"
 msgstr "(+%d ve�)"
 
-#: src/conversation.c:1750
+#: src/conversation.c:1760
 #, c-format
 msgid " left the room (%s)."
 msgstr " nas je zapustil (%s)."
 
-#: src/ft.c:188 src/protocols/msn/msn.c:412
+#: src/desktopitem.c:286
+#: src/desktopitem.c:875
+msgid "No name"
+msgstr "Brez imena"
+
+#: src/ft.c:188
+#: src/protocols/msn/msn.c:412
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1627,60 +1913,60 @@
 msgid "%s is offering to send file %s"
 msgstr "%s ponuja po邸iljanje datoteke %s"
 
-#: src/ft.c:422
+#: src/ft.c:426
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s ni veljavna datoteka.\n"
 
-#: src/ft.c:443
+#: src/ft.c:447
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Ponujeno po邸iljanje sporo�ila %s k %s"
 
-#: src/ft.c:454
+#: src/ft.c:458
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "Za�etek prenosa %s od %s"
 
-#: src/ft.c:608
+#: src/ft.c:612
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Prenos datoteke %s je dokon�an."
 
-#: src/ft.c:611
+#: src/ft.c:615
 msgid "File transfer complete"
 msgstr "Prenos datoteke je dokon�an."
 
-#: src/ft.c:995
+#: src/ft.c:999
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Prekinili ste prenos %s"
 
-#: src/ft.c:1000
+#: src/ft.c:1004
 msgid "File transfer cancelled"
 msgstr "Prenos datoteke je razveljavljen"
 
-#: src/ft.c:1057
+#: src/ft.c:1061
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s je prekinil prenos %s"
 
-#: src/ft.c:1062
+#: src/ft.c:1066
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s je prekinil prenos datoteke"
 
-#: src/ft.c:1119
+#: src/ft.c:1123
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Prenos datoteke do %s ni uspel."
 
-#: src/ft.c:1121
+#: src/ft.c:1125
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Prenos datoteke od %s ni uspel."
 
-#: src/gtkaccount.c:362
+#: src/gtkaccount.c:357
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1692,100 +1978,101 @@
 "<b>Velikost slike:</b> %dx%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:730
+#: src/gtkaccount.c:725
 msgid "Login Options"
 msgstr "Mo転nosti prijave"
 
-#: src/gtkaccount.c:747 src/gtkft.c:623
+#: src/gtkaccount.c:742
+#: src/gtkft.c:625
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: src/gtkaccount.c:752 src/gtkblist.c:4051
-msgid "Screen Name:"
-msgstr "Ime:"
-
-#: src/gtkaccount.c:825
+#: src/gtkaccount.c:747
+msgid "Screen name:"
+msgstr "Zaslonsko ime:"
+
+#: src/gtkaccount.c:821
 msgid "Password:"
 msgstr "Geslo:"
 
-#: src/gtkaccount.c:830 src/gtkblist.c:4065 src/gtkblist.c:4444
+#: src/gtkaccount.c:826
+#: src/gtkblist.c:4331
+#: src/gtkblist.c:4713
 msgid "Alias:"
 msgstr "Psevdonim:"
 
-#: src/gtkaccount.c:834
+#: src/gtkaccount.c:830
 msgid "Remember password"
 msgstr "Zapomni si geslo"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:879
+#: src/gtkaccount.c:875
 msgid "User Options"
 msgstr "Mo転nosti uporabnika"
 
-#: src/gtkaccount.c:892
+#: src/gtkaccount.c:888
 msgid "New mail notifications"
 msgstr "Obve邸�anje o prispeli po邸ti"
 
-#: src/gtkaccount.c:901
+#: src/gtkaccount.c:897
 msgid "Buddy icon:"
 msgstr "Ikona prijatelja:"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:990
+#: src/gtkaccount.c:988
 #, c-format
 msgid "%s Options"
 msgstr "%s Mo転nosti"
 
-#. Use Global Proxy Settings
-#: src/gtkaccount.c:1128 src/gtkaccount.c:1175
+#: src/gtkaccount.c:1189
 msgid "Use Global Proxy Settings"
 msgstr "uporabljaj splo邸no nastavitev stre転nikov proxy"
 
-#. No Proxy
-#: src/gtkaccount.c:1134 src/gtkaccount.c:1182
+#: src/gtkaccount.c:1195
 msgid "No Proxy"
 msgstr "brez stre転nika proxy"
 
-#. HTTP
-#: src/gtkaccount.c:1140 src/gtkaccount.c:1189
+#: src/gtkaccount.c:1201
 msgid "HTTP"
 msgstr "HTTP"
 
-#. SOCKS 4
-#: src/gtkaccount.c:1146 src/gtkaccount.c:1196
+#: src/gtkaccount.c:1207
 msgid "SOCKS 4"
 msgstr "SOCKS4"
 
-#. SOCKS 5
-#: src/gtkaccount.c:1152 src/gtkaccount.c:1203
+#: src/gtkaccount.c:1213
 msgid "SOCKS 5"
 msgstr "SOCKS5"
 
-#. Use Environmental Settings
-#: src/gtkaccount.c:1158 src/gtkaccount.c:1210 src/gtkprefs.c:1007
+#: src/gtkaccount.c:1219
+#: src/gtkprefs.c:1030
 msgid "Use Environmental Settings"
 msgstr "uporabi nastavitve okolja"
 
-#: src/gtkaccount.c:1249
+#: src/gtkaccount.c:1253
 msgid "you can see the butterflies mating"
 msgstr "lahko opazite metulje, ki se parijo"
 
-#: src/gtkaccount.c:1253
+#: src/gtkaccount.c:1257
 msgid "If you look real closely"
 msgstr "�e pogledate zelo pozorno,"
 
-#: src/gtkaccount.c:1269
+#: src/gtkaccount.c:1273
 msgid "Proxy Options"
 msgstr "Mo転nosti stre転nika proxy"
 
-#: src/gtkaccount.c:1287 src/gtkprefs.c:1001
+#: src/gtkaccount.c:1287
+#: src/gtkprefs.c:1024
 msgid "Proxy _type:"
 msgstr "Vrsta s_tre転nika proxy:"
 
-#: src/gtkaccount.c:1296 src/gtkprefs.c:1022
+#: src/gtkaccount.c:1296
+#: src/gtkprefs.c:1045
 msgid "_Host:"
 msgstr "_Stre転nik:"
 
-#: src/gtkaccount.c:1300 src/gtkprefs.c:1040
+#: src/gtkaccount.c:1300
+#: src/gtkprefs.c:1063
 msgid "_Port:"
 msgstr "_Vrata:"
 
@@ -1793,51 +2080,54 @@
 msgid "_Username:"
 msgstr "_Uporabni邸ko ime:"
 
-#: src/gtkaccount.c:1313 src/gtkprefs.c:1077
+#: src/gtkaccount.c:1314
+#: src/gtkprefs.c:1100
 msgid "Pa_ssword:"
 msgstr "Ge_slo:"
 
-#: src/gtkaccount.c:1700
+#: src/gtkaccount.c:1690
 msgid "Add Account"
 msgstr "Dodaj ra�un"
 
-#: src/gtkaccount.c:1702
+#: src/gtkaccount.c:1692
 msgid "Modify Account"
 msgstr "Spremeni ra�un"
 
 #. Register button
-#: src/gtkaccount.c:1750 src/protocols/jabber/jabber.c:706
+#: src/gtkaccount.c:1740
+#: src/protocols/jabber/jabber.c:706
 msgid "Register"
 msgstr "Registriraj se"
 
-#: src/gtkaccount.c:2118 src/gtksavedstatuses.c:217
+#: src/gtkaccount.c:2123
+#: src/gtksavedstatuses.c:295
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Ste prepri�ani, da 転elite izbrisati %s?"
 
-#: src/gtkaccount.c:2123 src/gtkrequest.c:265 src/gtksavedstatuses.c:220
+#: src/gtkaccount.c:2128
+#: src/gtkpounce.c:999
+#: src/gtkrequest.c:291
+#: src/gtksavedstatuses.c:298
 msgid "Delete"
 msgstr "Zbri邸i"
 
-#: src/gtkaccount.c:2187 src/gtksavedstatuses.c:686
-#: src/protocols/oscar/oscar.c:5049
+#: src/gtkaccount.c:2186
+#: src/gtksavedstatuses.c:864
+#: src/protocols/oscar/oscar.c:5051
 msgid "Screen Name"
 msgstr "Ime"
 
-#: src/gtkaccount.c:2210
-msgid "Enabled"
-msgstr "Omogo�en"
-
-#: src/gtkaccount.c:2218
+#: src/gtkaccount.c:2217
 msgid "Protocol"
 msgstr "Protokol"
 
-#: src/gtkaccount.c:2550
+#: src/gtkaccount.c:2549
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s je nastavil %s za svojega prijatelja%s%s%s"
 
-#: src/gtkaccount.c:2564
+#: src/gtkaccount.c:2563
 msgid ""
 "\n"
 "\n"
@@ -1847,239 +2137,260 @@
 "\n"
 "Ali ga/jo 転elite dodati na svoj seznam prijateljev?"
 
-#: src/gtkaccount.c:2572
+#: src/gtkaccount.c:2571
 msgid "Add buddy to your list?"
 msgstr "貼elite dodati prijatelja na seznam?"
 
-#: src/gtkaccount.c:2574 src/gtkblist.c:4496 src/gtkconv.c:1527
-#: src/gtkrequest.c:266 src/protocols/gg/gg.c:655
-#: src/protocols/oscar/oscar.c:4674 src/protocols/silc/chat.c:594
+#: src/gtkaccount.c:2573
+#: src/gtkblist.c:4765
+#: src/gtkconv.c:1554
+#: src/gtkrequest.c:292
+#: src/protocols/gg/gg.c:830
+#: src/protocols/oscar/oscar.c:4676
+#: src/protocols/sametime/sametime.c:5557
+#: src/protocols/silc/chat.c:595
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/gtkblist.c:595
+#: src/gtkblist.c:635
 msgid "Join a Chat"
 msgstr "Pridru転i se pomenku"
 
-#: src/gtkblist.c:616
-msgid ""
-"Please enter the appropriate information about the chat you would like to "
-"join.\n"
+#: src/gtkblist.c:656
+msgid "Please enter the appropriate information about the chat you would like to join.\n"
 msgstr "Vnesite ustrezne informacije o pomenku, ki se mu 転elite pridru転iti.\n"
 
-#: src/gtkblist.c:627 src/gtkpounce.c:415 src/gtkroomlist.c:354
+#: src/gtkblist.c:667
+#: src/gtkpounce.c:500
+#: src/gtkroomlist.c:354
 msgid "_Account:"
 msgstr "_Ra�un:"
 
-#: src/gtkblist.c:935
+#: src/gtkblist.c:975
 msgid "Get _Info"
 msgstr "_Informacije"
 
-#: src/gtkblist.c:938
+#: src/gtkblist.c:978
 msgid "I_M"
 msgstr "_Sporo�i"
 
-#: src/gtkblist.c:944
+#: src/gtkblist.c:984
 msgid "_Send File"
 msgstr "_Po邸lji datoteko"
 
-#: src/gtkblist.c:950
+#: src/gtkblist.c:992
+msgid "Start _Voice Chat"
+msgstr "Za�ni glaso_vni klepet"
+
+#: src/gtkblist.c:998
 msgid "Add Buddy _Pounce"
 msgstr "Dodaj _opozorilo prijatelja"
 
-#: src/gtkblist.c:954 src/gtkblist.c:958 src/gtkblist.c:1056
-#: src/gtkblist.c:1079
+#: src/gtkblist.c:1002
+#: src/gtkblist.c:1006
+#: src/gtkblist.c:1106
+#: src/gtkblist.c:1129
 msgid "View _Log"
 msgstr "Poglej _dnevnik"
 
-#: src/gtkblist.c:969
+#: src/gtkblist.c:1017
 msgid "_Alias Buddy..."
 msgstr "Psevdonim prij_atelja ..."
 
-#: src/gtkblist.c:971
+#: src/gtkblist.c:1019
 msgid "_Remove Buddy"
 msgstr "Odst_rani prijatelja"
 
-#: src/gtkblist.c:973
+#: src/gtkblist.c:1021
 msgid "Alias Contact..."
 msgstr "Psevdonim stika ..."
 
-#: src/gtkblist.c:976 src/gtkdialogs.c:808 src/gtkdialogs.c:809
+#: src/gtkblist.c:1024
+#: src/gtkdialogs.c:836
+#: src/gtkdialogs.c:837
 msgid "Remove Contact"
 msgstr "Odstrani stik"
 
-#: src/gtkblist.c:980 src/gtkblist.c:1064 src/gtkblist.c:1085
+#: src/gtkblist.c:1028
+#: src/gtkblist.c:1114
+#: src/gtkblist.c:1135
 msgid "_Alias..."
 msgstr "_Psevdonim ..."
 
-#: src/gtkblist.c:982 src/gtkblist.c:1066 src/gtkblist.c:1087
+#: src/gtkblist.c:1030
+#: src/gtkblist.c:1116
+#: src/gtkblist.c:1137
 msgid "_Remove"
 msgstr "Odst_rani"
 
-#: src/gtkblist.c:1028
+#: src/gtkblist.c:1077
 msgid "Add a _Buddy"
 msgstr "Dodaj _prijatelja"
 
-#: src/gtkblist.c:1030
+#: src/gtkblist.c:1079
 msgid "Add a C_hat"
 msgstr "Dodaj po_menek"
 
-#: src/gtkblist.c:1032
+#: src/gtkblist.c:1082
 msgid "_Delete Group"
 msgstr "_Zbri邸i skupino"
 
-#: src/gtkblist.c:1034
+#: src/gtkblist.c:1084
 msgid "_Rename"
 msgstr "P_reimenuj"
 
 #. join button
-#: src/gtkblist.c:1052 src/gtkroomlist.c:264 src/gtkroomlist.c:409
-#: src/gtkstock.c:118
+#: src/gtkblist.c:1102
+#: src/gtkroomlist.c:264
+#: src/gtkroomlist.c:409
+#: src/gtkstock.c:139
 msgid "_Join"
 msgstr "_Pridru転i se"
 
-#: src/gtkblist.c:1054
+#: src/gtkblist.c:1104
 msgid "Auto-Join"
 msgstr "Samodejno-pridru転i"
 
-#: src/gtkblist.c:1092 src/gtkblist.c:1115
+#: src/gtkblist.c:1142
+#: src/gtkblist.c:1165
 msgid "_Collapse"
 msgstr "_Strni"
 
-#: src/gtkblist.c:1120
+#: src/gtkblist.c:1170
 msgid "_Expand"
 msgstr "_Raz邸iri"
 
-#: src/gtkblist.c:1353 src/gtkblist.c:1363 src/gtkblist.c:3326
-#: src/gtkblist.c:3331
+#: src/gtkblist.c:1401
+#: src/gtkblist.c:1411
+#: src/gtkblist.c:3588
+#: src/gtkblist.c:3593
 msgid "/Tools/Mute Sounds"
 msgstr "/Orodja/Uti邸aj zvoke"
 
-#: src/gtkblist.c:1822 src/gtkconv.c:3745 src/gtkpounce.c:314
-msgid ""
-"You are not currently signed on with an account that can add that buddy."
-msgstr ""
-"Trenutno niste prijavljeni z nobenim ra�unom, ki lahko doda tega prijatelja."
+#: src/gtkblist.c:1870
+#: src/gtkconv.c:3870
+#: src/gtkpounce.c:399
+msgid "You are not currently signed on with an account that can add that buddy."
+msgstr "Trenutno niste prijavljeni z nobenim ra�unom, ki lahko doda tega prijatelja."
 
 #. Buddies menu
-#: src/gtkblist.c:2329
+#: src/gtkblist.c:2434
 msgid "/_Buddies"
 msgstr "/_Prijatelji"
 
-#: src/gtkblist.c:2330
+#: src/gtkblist.c:2435
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Prijatelji/Novo _neposredno sporo�ilo ..."
 
-#: src/gtkblist.c:2331
+#: src/gtkblist.c:2436
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Prijatelji/Pridru転i se _pomenku ..."
 
-#: src/gtkblist.c:2332
+#: src/gtkblist.c:2437
 msgid "/Buddies/Get User _Info..."
 msgstr "/Prijatelji/Informacije o _uporabniku ..."
 
-#: src/gtkblist.c:2333
+#: src/gtkblist.c:2438
 msgid "/Buddies/View User _Log..."
 msgstr "/Prijatelji/Pog_lej uporabnikov dnevnik ..."
 
-#: src/gtkblist.c:2335
+#: src/gtkblist.c:2440
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Prijatelji/Prika転i prijatelje, ki niso na z_vezi"
 
-#: src/gtkblist.c:2336
+#: src/gtkblist.c:2441
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Prijatelji/Prika転i pra_zne skupine"
 
-#: src/gtkblist.c:2337
-#, fuzzy
+#: src/gtkblist.c:2442
 msgid "/Buddies/Show Buddy _Details"
-msgstr "/Prijatelji/Poka転i prijatelje, ki niso na zvezi"
-
-#: src/gtkblist.c:2338 src/gtkblist.c:5158
-#, fuzzy
+msgstr "/Prijatelji/Poka転i p_odrobnosti prijateljev"
+
+#: src/gtkblist.c:2443
+#: src/gtkblist.c:5466
 msgid "/Buddies/Sort Buddies"
-msgstr "/Prijatelji/Poka転i prijatelje, ki niso na zvezi"
-
-#: src/gtkblist.c:2340
+msgstr "/Prijatelji/Razvrsti prijatelje"
+
+#: src/gtkblist.c:2445
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Prijatelji/Dodaj p_rijatelja ..."
 
-#: src/gtkblist.c:2341
+#: src/gtkblist.c:2446
 msgid "/Buddies/Add C_hat..."
 msgstr "/Prijatelji/Dodaj p_omenek ..."
 
-#: src/gtkblist.c:2342
+#: src/gtkblist.c:2447
 msgid "/Buddies/Add _Group..."
 msgstr "/Prijatelji/Dodaj s_kupino ..."
 
-#: src/gtkblist.c:2344
+#: src/gtkblist.c:2449
 msgid "/Buddies/_Quit"
 msgstr "/Prijatelji/Iz_hod"
 
 #. Tools
-#: src/gtkblist.c:2347
+#: src/gtkblist.c:2452
 msgid "/_Tools"
 msgstr "/_Orodja"
 
-#: src/gtkblist.c:2348
-msgid "/Tools/Buddy _Pounce"
-msgstr "/Orodja/Opozorila pri_jateljev"
-
-#: src/gtkblist.c:2349
+#: src/gtkblist.c:2453
 msgid "/Tools/Account Ac_tions"
 msgstr "/Orodja/Dejanja ra_�una"
 
-#: src/gtkblist.c:2351
+#: src/gtkblist.c:2455
 msgid "/Tools/A_ccounts"
 msgstr "/Orodja/_Ra�uni"
 
-#: src/gtkblist.c:2352
+#: src/gtkblist.c:2456
+msgid "/Tools/Buddy _Pounces"
+msgstr "/Orodja/Opozorila pri_jateljev"
+
+#: src/gtkblist.c:2457
+msgid "/Tools/Plu_gins"
+msgstr "/Orodja/Vstav_ki"
+
+#: src/gtkblist.c:2458
 msgid "/Tools/Pr_eferences"
 msgstr "/Orodja/_Nastavitve"
 
-#: src/gtkblist.c:2353
-#, fuzzy
-msgid "/Tools/Plu_gins"
-msgstr "/Orodja/Dejanja vstavkov"
-
-#: src/gtkblist.c:2354
+#: src/gtkblist.c:2459
 msgid "/Tools/Pr_ivacy"
 msgstr "/Orodja/_Zasebnost"
 
-#: src/gtkblist.c:2355
+#: src/gtkblist.c:2461
 msgid "/Tools/_File Transfers"
 msgstr "/Orodja/_Prenosi datotek"
 
-#: src/gtkblist.c:2356
+#: src/gtkblist.c:2462
 msgid "/Tools/R_oom List"
 msgstr "/Orodja/_Seznam sob"
 
-#: src/gtkblist.c:2358
+#: src/gtkblist.c:2463
+msgid "/Tools/View System _Log"
+msgstr "/Orodja/Poglej sistemski _dnevnik"
+
+#: src/gtkblist.c:2465
 msgid "/Tools/Mute _Sounds"
 msgstr "/Orodja/_Uti邸aj zvoke"
 
-#: src/gtkblist.c:2359
-msgid "/Tools/View System _Log"
-msgstr "/Orodja/Poglej sistemski _dnevnik"
-
 #. Help
-#: src/gtkblist.c:2362
+#: src/gtkblist.c:2468
 msgid "/_Help"
 msgstr "/_Pomo�"
 
-#: src/gtkblist.c:2363
+#: src/gtkblist.c:2469
 msgid "/Help/Online _Help"
 msgstr "/Pomo�/Pomo� _na spletu"
 
-#: src/gtkblist.c:2364
+#: src/gtkblist.c:2470
 msgid "/Help/_Debug Window"
 msgstr "/Pomo�/Raz_hro邸�evalno okno"
 
-#: src/gtkblist.c:2365
+#: src/gtkblist.c:2471
 msgid "/Help/_About"
 msgstr "/pomo�/_O programu"
 
-#: src/gtkblist.c:2397 src/gtkblist.c:2464
+#: src/gtkblist.c:2503
+#: src/gtkblist.c:2570
 #, c-format
 msgid ""
 "\n"
@@ -2088,7 +2399,7 @@
 "\n"
 "<b>Ra�un:</b> %s"
 
-#: src/gtkblist.c:2473
+#: src/gtkblist.c:2579
 #, c-format
 msgid ""
 "\n"
@@ -2097,7 +2408,7 @@
 "\n"
 "<b>Psevdonim stika:</b> %s"
 
-#: src/gtkblist.c:2481
+#: src/gtkblist.c:2587
 #, c-format
 msgid ""
 "\n"
@@ -2106,7 +2417,7 @@
 "\n"
 "<b>Psevdonim:</b> %s"
 
-#: src/gtkblist.c:2489
+#: src/gtkblist.c:2595
 #, c-format
 msgid ""
 "\n"
@@ -2115,7 +2426,7 @@
 "\n"
 "<b>Vzdevek:</b> %s"
 
-#: src/gtkblist.c:2498
+#: src/gtkblist.c:2604
 #, c-format
 msgid ""
 "\n"
@@ -2124,7 +2435,7 @@
 "\n"
 "<b>Prijavljen(i):</b> %s"
 
-#: src/gtkblist.c:2510
+#: src/gtkblist.c:2616
 #, c-format
 msgid ""
 "\n"
@@ -2133,7 +2444,7 @@
 "\n"
 "<b>Nedejaven:</b> %s"
 
-#: src/gtkblist.c:2546
+#: src/gtkblist.c:2651
 #, c-format
 msgid ""
 "\n"
@@ -2142,7 +2453,7 @@
 "\n"
 "<b>Zadnji� viden:</b> pred %s"
 
-#: src/gtkblist.c:2554
+#: src/gtkblist.c:2659
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2150,7 +2461,7 @@
 "\n"
 "<b>Stanje:</b> Ni na zvezi"
 
-#: src/gtkblist.c:2577
+#: src/gtkblist.c:2682
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2158,7 +2469,7 @@
 "\n"
 "<b>Opis:</b> Stra邸ljivo"
 
-#: src/gtkblist.c:2579
+#: src/gtkblist.c:2684
 msgid ""
 "\n"
 "<b>Status:</b> Awesome"
@@ -2166,7 +2477,7 @@
 "\n"
 "<b>Stanje</b>: Neverjetno!"
 
-#: src/gtkblist.c:2581
+#: src/gtkblist.c:2686
 msgid ""
 "\n"
 "<b>Status:</b> Rockin'"
@@ -2174,187 +2485,260 @@
 "\n"
 "<b>Stanje</b>: Kulsko"
 
-#: src/gtkblist.c:2843
+#: src/gtkblist.c:2952
 #, c-format
 msgid "Idle (%dh %02dm) "
 msgstr "Nedejaven (%dh%02dm) "
 
-#: src/gtkblist.c:2845
+#: src/gtkblist.c:2954
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Nedejaven (%dm) "
 
-#: src/gtkblist.c:2848
+#: src/gtkblist.c:2957
 msgid "Idle "
 msgstr "Nedejaven"
 
-#: src/gtkblist.c:2852
+#: src/gtkblist.c:2961
 msgid "Offline "
 msgstr "Ni na zvezi "
 
-#: src/gtkblist.c:2968
+#: src/gtkblist.c:3077
 msgid "/Buddies/New Instant Message..."
 msgstr "/Prijatelji/Novo neposredno sporo�ilo ..."
 
-#: src/gtkblist.c:2969 src/gtkblist.c:3003
+#: src/gtkblist.c:3078
+#: src/gtkblist.c:3111
 msgid "/Buddies/Join a Chat..."
 msgstr "/Prijatelji/Pridru転i se pomenku ..."
 
-#: src/gtkblist.c:2970
+#: src/gtkblist.c:3079
 msgid "/Buddies/Get User Info..."
 msgstr "/Prijatelji/Informacije o uporabniku ..."
 
-#: src/gtkblist.c:2971
+#: src/gtkblist.c:3080
 msgid "/Buddies/Add Buddy..."
 msgstr "/Prijatelji/Dodaj prijatelja ..."
 
-#: src/gtkblist.c:2972
+#: src/gtkblist.c:3081
+#: src/gtkblist.c:3114
 msgid "/Buddies/Add Chat..."
 msgstr "/Prijatelji/Dodaj pomenek ..."
 
-#: src/gtkblist.c:2973
+#: src/gtkblist.c:3082
 msgid "/Buddies/Add Group..."
 msgstr "/Prijatelji/Dodaj skupino ..."
 
-#: src/gtkblist.c:3006
-msgid "/Tools/Room List"
-msgstr "/Orodja/Seznam sob"
-
-#: src/gtkblist.c:3009
+#: src/gtkblist.c:3117
+msgid "/Tools/Buddy Pounces"
+msgstr "/Orodja/Opozorila prijateljev"
+
+#: src/gtkblist.c:3120
 msgid "/Tools/Privacy"
 msgstr "/Orodja/Zasebnost"
 
-#: src/gtkblist.c:3085
-#, fuzzy
+#: src/gtkblist.c:3123
+msgid "/Tools/Room List"
+msgstr "/Orodja/Seznam sob"
+
+#: src/gtkblist.c:3201
+#, c-format
+msgid "%d unread message from %s\n"
+msgid_plural "%d unread messages from %s\n"
+msgstr[0] "%d neprebranih sporo�il od %s\n"
+msgstr[1] "%d neprebrano sporo�ilo od %s\n"
+msgstr[2] "%d neprebrani sporo�ili od %s\n"
+msgstr[3] "%d neprebrana sporo�ila od %s\n"
+
+#: src/gtkblist.c:3285
 msgid "Manually"
-msgstr "Ro�ni"
-
-#: src/gtkblist.c:3087
-#, fuzzy
+msgstr "ro�no"
+
+#: src/gtkblist.c:3287
 msgid "Alphabetically"
 msgstr "abecedno"
 
-#: src/gtkblist.c:3088
+#: src/gtkblist.c:3288
 msgid "By status"
 msgstr "po stanju"
 
-#: src/gtkblist.c:3089
+#: src/gtkblist.c:3289
 msgid "By log size"
 msgstr "po obsegu dnevnika"
 
-#: src/gtkblist.c:3201
-msgid "/Tools/Buddy Pounce"
-msgstr "/Orodja/Opozorila prijateljev"
-
-#: src/gtkblist.c:3202
+#: src/gtkblist.c:3451
 msgid "/Tools/Account Actions"
 msgstr "/Orodja/Dejanja ra_�una"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3322
+#: src/gtkblist.c:3584
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Prijatelji/Poka転i prijatelje, ki niso na zvezi"
 
-#: src/gtkblist.c:3324
+#: src/gtkblist.c:3586
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Prijatelji/Poka転i prazne skupine"
 
-#: src/gtkblist.c:3328
-#, fuzzy
+#: src/gtkblist.c:3590
 msgid "/Buddies/Show Buddy Details"
-msgstr "/Prijatelji/Poka転i prijatelje, ki niso na zvezi"
-
-#: src/gtkblist.c:4005 src/protocols/silc/buddy.c:736
-#: src/protocols/silc/buddy.c:994 src/protocols/silc/buddy.c:1039
-#: src/protocols/silc/buddy.c:1129 src/protocols/yahoo/yahoo.c:2886
+msgstr "/Prijatelji/Poka転i podrobnosti prijatelja"
+
+#: src/gtkblist.c:4271
+#: src/protocols/silc/buddy.c:737
+#: src/protocols/silc/buddy.c:995
+#: src/protocols/silc/buddy.c:1040
+#: src/protocols/silc/buddy.c:1139
+#: src/protocols/yahoo/yahoo.c:2903
 msgid "Add Buddy"
 msgstr "Dodaj prijatelja"
 
-#: src/gtkblist.c:4029
-msgid ""
-"Please enter the screen name of the person you would like to add to your "
-"buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
-"The alias will be displayed in place of the screen name whenever possible.\n"
-msgstr ""
-"Prosim vnesite ime osebe, ki jo 転elite dodati va邸emu seznamu prijateljev. "
-"Vnesete lahko tudi psevdonim ali vzdevek. Kjer bo izvedljivo, bo namesto "
-"vzdevka prikazan psevdonim.\n"
+#: src/gtkblist.c:4295
+msgid "Please enter the screen name of the person you would like to add to your buddy list. You may optionally enter an alias, or nickname,  for the buddy. The alias will be displayed in place of the screen name whenever possible.\n"
+msgstr "Prosim vnesite ime osebe, ki jo 転elite dodati va邸emu seznamu prijateljev. Vnesete lahko tudi psevdonim ali vzdevek. Kjer bo izvedljivo, bo namesto vzdevka prikazan psevdonim.\n"
+
+#: src/gtkblist.c:4317
+msgid "Screen Name:"
+msgstr "Ime:"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:4092 src/gtkblist.c:4424
+#: src/gtkblist.c:4358
+#: src/gtkblist.c:4693
 msgid "Account:"
 msgstr "Ra�un:"
 
-#: src/gtkblist.c:4357
+#: src/gtkblist.c:4626
 msgid "This protocol does not support chat rooms."
 msgstr "Ta protokol ne podpira klepetalnic."
 
-#: src/gtkblist.c:4373
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"chat."
-msgstr ""
-"Trenutno niste prijavljeni na nobenem izmed protokolov, ki podpirajo pomenke."
-
-#: src/gtkblist.c:4390
+#: src/gtkblist.c:4642
+msgid "You are not currently signed on with any protocols that have the ability to chat."
+msgstr "Trenutno niste prijavljeni na nobenem izmed protokolov, ki podpirajo pomenke."
+
+#: src/gtkblist.c:4659
 msgid "Add Chat"
 msgstr "Dodaj pomenek"
 
-#: src/gtkblist.c:4414
-msgid ""
-"Please enter an alias, and the appropriate information about the chat you "
-"would like to add to your buddy list.\n"
-msgstr ""
-"Prosim vnesite psevdonim in ostale informacije za pomenek, ki ga 転elite "
-"dodati na seznam prijateljev.\n"
-
-#: src/gtkblist.c:4493
+#: src/gtkblist.c:4683
+msgid "Please enter an alias, and the appropriate information about the chat you would like to add to your buddy list.\n"
+msgstr "Prosim vnesite psevdonim in ostale informacije za pomenek, ki ga 転elite dodati na seznam prijateljev.\n"
+
+#: src/gtkblist.c:4762
+#: src/protocols/sametime/sametime.c:5471
+#: src/protocols/sametime/sametime.c:5555
 msgid "Add Group"
 msgstr "Dodaj skupino"
 
-#: src/gtkblist.c:4494
+#: src/gtkblist.c:4763
 msgid "Please enter the name of the group to be added."
 msgstr "Prosimo vnesite ime skupine, ki jo 転elite dodati."
 
-#: src/gtkblist.c:5025
+#: src/gtkblist.c:5331
 msgid "No actions available"
 msgstr "Na voljo ni nobenega ukaza"
 
-#: src/gtkblist.c:5094
-#, fuzzy
+#: src/gtkblist.c:5400
 msgid "/Tools"
-msgstr "/_Orodja"
-
-#: src/gtkconn.c:190
-#, fuzzy, c-format
+msgstr "/Orodja"
+
+#: src/gtkcellview.c:198
+msgid "Background color name"
+msgstr "Ime barve ozadja"
+
+#: src/gtkcellview.c:199
+msgid "Background color as a string"
+msgstr "Barva ozadja kot niz"
+
+#: src/gtkcellview.c:205
+#: src/gtkimhtmltoolbar.c:1007
+msgid "Background color"
+msgstr "Barva ozadja"
+
+#: src/gtkcellview.c:206
+msgid "Background color as a GdkColor"
+msgstr "Barva ozadja kot GdkColor"
+
+#: src/gtkcellview.c:213
+msgid "Background set"
+msgstr "Ozadje nastavljeno"
+
+#: src/gtkcellview.c:214
+msgid "Whether this tag affects the background color"
+msgstr "Ali ta zaznamek vpliva na barvo ozadja"
+
+#: src/gtkcombobox.c:491
+msgid "ComboBox model"
+msgstr "Model kombiniranega polja"
+
+#: src/gtkcombobox.c:492
+msgid "The model for the combo box"
+msgstr "Model kombiniranega polja"
+
+#: src/gtkcombobox.c:499
+msgid "Wrap width"
+msgstr "�irina preloma"
+
+#: src/gtkcombobox.c:500
+msgid "Wrap width for layouting the items in a grid"
+msgstr "�irina preloma za prikaz elementov v mre転i"
+
+#: src/gtkcombobox.c:509
+msgid "Row span column"
+msgstr "Stolpec raz邸iri vrstica"
+
+#: src/gtkcombobox.c:510
+msgid "TreeModel column containing the row span values"
+msgstr "Stolpec TreeModel vsebuje vrednosti raz邸irjenosti vrstice"
+
+#: src/gtkcombobox.c:519
+msgid "Column span column"
+msgstr "Stolpec raz邸iri stolpec"
+
+#: src/gtkcombobox.c:521
+msgid "TreeModel column containing the column span values"
+msgstr "Vrstica TreeModel vsebuje vrednosti raz邸irjenosti stolpca"
+
+#: src/gtkcombobox.c:530
+msgid "Active item"
+msgstr "Aktivni element"
+
+#: src/gtkcombobox.c:531
+msgid "The item which is currently active"
+msgstr "Element, ki je trenutno aktiven"
+
+#: src/gtkcombobox.c:539
+msgid "Appears as list"
+msgstr "V obliki seznama"
+
+#: src/gtkcombobox.c:540
+msgid "Whether combobox dropdowns should look like lists rather than menus"
+msgstr "�e naj bodo roletni meniji kombiniranega polja seznami namesto menijev"
+
+#: src/gtkconn.c:229
+#, c-format
 msgid "%s disconnected"
-msgstr "Povezava prekinjena."
-
-#: src/gtkconn.c:191
-#, fuzzy, c-format
-msgid ""
-"%s was disconnected due to an error. %s The account has been disabled. "
-"Correct the error and reenable the account to connect."
-msgstr ""
-"%s se ne more povezati zaradi napake. %s Ra�un je bil onemogo�en. Odpravite "
-"napako in ponovno omogo�ite povezavanje za ra�un."
-
-#: src/gtkconv.c:325
+msgstr "%s se je odjavil"
+
+#: src/gtkconn.c:230
+#, c-format
+msgid "%s was disconnected due to an error. %s The account has been disabled. Correct the error and reenable the account to connect."
+msgstr "%s je bil odjavljen zaradi napake. %s Ra�un je bil onemogo�en. Odpravite napako in ponovno omogo�ite povezavanje za ra�un."
+
+#: src/gtkconv.c:331
 #, c-format
 msgid "me is using Gaim v%s."
 msgstr "uporabljam Gaim v%s."
 
-#: src/gtkconv.c:334
+#: src/gtkconv.c:340
 msgid "Supported debug options are:  version"
 msgstr "Podprte mo転nosti razhro邸�evanja:  razli�ica"
 
-#: src/gtkconv.c:371
+#: src/gtkconv.c:376
 msgid "No such command (in this context)."
 msgstr "Tak ukaz ne obstaja (v tem sklopu)."
 
-#: src/gtkconv.c:374
+#: src/gtkconv.c:379
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -2362,335 +2746,339 @@
 "Uporabite \"&lt;ukaz&gt; /help\" za pomo� o dolo�enem ukazu.\n"
 "V tem sklopu so na voljo naslednji ukazi:\n"
 
-#: src/gtkconv.c:446
+#: src/gtkconv.c:451
 msgid "No such command."
 msgstr "Ta ukaz ne obstaja."
 
-#: src/gtkconv.c:453
+#: src/gtkconv.c:458
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
-msgstr ""
-"Skladenjska napaka: vtipkali ste napa�no 邸tevilo argumentov za ta ukaz."
-
-#: src/gtkconv.c:458
+msgstr "Skladenjska napaka: vtipkali ste napa�no 邸tevilo argumentov za ta ukaz."
+
+#: src/gtkconv.c:463
 msgid "Your command failed for an unknown reason."
 msgstr "Va邸 ukaz iz neznanega razloga ni uspel."
 
-#: src/gtkconv.c:465
+#: src/gtkconv.c:470
 msgid "That command only works in chats, not IMs."
 msgstr "Ta ukaz deluje samo v klepetih in ne v neposrednih sporo�ilih."
 
-#: src/gtkconv.c:468
+#: src/gtkconv.c:473
 msgid "That command only works in IMs, not chats."
 msgstr "Ta ukaz deluje samo v neposrednih sporo�ilih in ne v klepetih."
 
-#: src/gtkconv.c:472
+#: src/gtkconv.c:477
 msgid "That command doesn't work on this protocol."
 msgstr "Ta ukaz ne deluje na tem protokolu."
 
-#: src/gtkconv.c:699 src/gtkconv.c:725
+#: src/gtkconv.c:709
+#: src/gtkconv.c:735
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Tisti prijatelj ne uporablja enakega protokola kot ta pogovor."
 
-#: src/gtkconv.c:719
-msgid ""
-"You are not currently signed on with an account that can invite that buddy."
-msgstr ""
-"Trenutno niste prijavljeni z nobenim ra�unom, ki lahko doda tega prijatelja."
-
-#: src/gtkconv.c:772
+#: src/gtkconv.c:729
+msgid "You are not currently signed on with an account that can invite that buddy."
+msgstr "Trenutno niste prijavljeni z nobenim ra�unom, ki lahko doda tega prijatelja."
+
+#: src/gtkconv.c:782
 msgid "Invite Buddy Into Chat Room"
 msgstr "Povabi prijatelja v pogovorno sobo"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:802
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"Prosim vnesite ime uporabnika, ki ga 転elite povabiti, dodate pa lahko 邸e "
-"povabilo."
-
-#: src/gtkconv.c:823
+#: src/gtkconv.c:812
+msgid "Please enter the name of the user you wish to invite, along with an optional invite message."
+msgstr "Prosim vnesite ime uporabnika, ki ga 転elite povabiti, dodate pa lahko 邸e povabilo."
+
+#: src/gtkconv.c:833
 msgid "_Buddy:"
 msgstr "_Prijatelj:"
 
-#: src/gtkconv.c:843 src/gtksavedstatuses.c:836
+#: src/gtkconv.c:853
+#: src/gtksavedstatuses.c:1068
+#: src/gtksavedstatuses.c:1365
 msgid "_Message:"
 msgstr "_Sporo�ilo:"
 
-#: src/gtkconv.c:900 src/gtkconv.c:2228 src/gtkdebug.c:217 src/gtkft.c:470
+#: src/gtkconv.c:910
+#: src/gtkconv.c:2255
+#: src/gtkdebug.c:217
+#: src/gtkft.c:472
 msgid "Unable to open file."
 msgstr "Datoteke ni bilo mogo�e odprti."
 
-#: src/gtkconv.c:906
+#: src/gtkconv.c:916
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Pogovor z %s</h1>\n"
 
-#: src/gtkconv.c:930
+#: src/gtkconv.c:940
 msgid "Save Conversation"
 msgstr "Shrani pogovor"
 
-#: src/gtkconv.c:1030 src/gtkdebug.c:165 src/gtkdebug.c:678
+#: src/gtkconv.c:1057
+#: src/gtkdebug.c:165
+#: src/gtkdebug.c:678
 msgid "Find"
 msgstr "Najdi"
 
-#: src/gtkconv.c:1056 src/gtkdebug.c:193
+#: src/gtkconv.c:1083
+#: src/gtkdebug.c:193
 msgid "_Search for:"
 msgstr "_I邸�i:"
 
-#: src/gtkconv.c:1227
-#, fuzzy
+#: src/gtkconv.c:1254
 msgid "Logging started. Future messages in this conversation will be logged."
-msgstr "Bele転enje tega pogovora v dnevnik ni uspelo."
-
-#: src/gtkconv.c:1235
-#, fuzzy
-msgid ""
-"Logging stopped. Future messages in this conversation will not be logged."
-msgstr "Bele転enje tega pogovora v dnevnik ni uspelo."
-
-#: src/gtkconv.c:1489
+msgstr "Za�elo se je bele転enje v dnevnik. Vsa nadaljna sporo�ila pogovora bodo zabele転ena."
+
+#: src/gtkconv.c:1262
+msgid "Logging stopped. Future messages in this conversation will not be logged."
+msgstr "Bele転enje v dnevnik ustavljeno. Nadaljna sporo�ila pogovora ne bodo zabele転ena."
+
+#: src/gtkconv.c:1516
 msgid "IM"
 msgstr "Sporo�i"
 
-#: src/gtkconv.c:1495 src/protocols/oscar/oscar.c:628
+#: src/gtkconv.c:1522
+#: src/protocols/oscar/oscar.c:630
 msgid "Send File"
 msgstr "Po邸lji datoteko"
 
-#: src/gtkconv.c:1502
+#: src/gtkconv.c:1529
 msgid "Un-Ignore"
 msgstr "Ne prezri"
 
-#: src/gtkconv.c:1505
+#: src/gtkconv.c:1532
 msgid "Ignore"
 msgstr "Prezri"
 
-#: src/gtkconv.c:1511
+#: src/gtkconv.c:1538
 msgid "Info"
 msgstr "Informacije"
 
-#: src/gtkconv.c:1517
+#: src/gtkconv.c:1544
 msgid "Get Away Message"
 msgstr "Sporo�ilo o odsotnosti"
 
-#: src/gtkconv.c:1524 src/gtkrequest.c:267
+#: src/gtkconv.c:1551
+#: src/gtkrequest.c:293
 msgid "Remove"
 msgstr "Odstrani"
 
-#: src/gtkconv.c:2236
+#: src/gtkconv.c:2263
 msgid "Unable to save icon file to disk."
 msgstr "Datoteke z ikonami ni bilo mogo�e shraniti."
 
-#: src/gtkconv.c:2259
+#: src/gtkconv.c:2286
 msgid "Save Icon"
 msgstr "Shrani ikono"
 
-#: src/gtkconv.c:2308
+#: src/gtkconv.c:2335
 msgid "Animate"
 msgstr "Animiraj"
 
-#: src/gtkconv.c:2313
+#: src/gtkconv.c:2340
 msgid "Hide Icon"
 msgstr "Skrij ikono"
 
-#: src/gtkconv.c:2319
+#: src/gtkconv.c:2346
 msgid "Save Icon As..."
 msgstr "Shrani ikono kot ..."
 
 #. Conversation menu
-#: src/gtkconv.c:2367
+#: src/gtkconv.c:2484
 msgid "/_Conversation"
 msgstr "/_Pogovor"
 
-#: src/gtkconv.c:2369
+#: src/gtkconv.c:2486
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Pogovor/Novo neposredno sporo�ilo ..."
 
-#: src/gtkconv.c:2374
+#: src/gtkconv.c:2491
 msgid "/Conversation/_Find..."
 msgstr "/Pogovor/_Najdi ..."
 
-#: src/gtkconv.c:2376
+#: src/gtkconv.c:2493
 msgid "/Conversation/View _Log"
 msgstr "/Pogovor/Pog_lej dnevnik ..."
 
-#: src/gtkconv.c:2377
+#: src/gtkconv.c:2494
 msgid "/Conversation/_Save As..."
 msgstr "/Pogovor/_Shrani kot ..."
 
-#: src/gtkconv.c:2379
+#: src/gtkconv.c:2496
 msgid "/Conversation/Clear"
 msgstr "/Pogovor/Po�isti"
 
-#: src/gtkconv.c:2383
+#: src/gtkconv.c:2500
 msgid "/Conversation/Se_nd File..."
 msgstr "/Pogovor/_Po邸lji datoteko ..."
 
-#: src/gtkconv.c:2384
+#: src/gtkconv.c:2501
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Pogovor/Dodaj _opozorilo prijatelja ..."
 
-#: src/gtkconv.c:2386
+#: src/gtkconv.c:2503
 msgid "/Conversation/_Get Info"
 msgstr "/Pogovor/_Informacije"
 
-#: src/gtkconv.c:2388
+#: src/gtkconv.c:2505
 msgid "/Conversation/In_vite..."
 msgstr "/Pogovor/Po_vabi ..."
 
-#: src/gtkconv.c:2393
+#: src/gtkconv.c:2510
 msgid "/Conversation/Al_ias..."
 msgstr "/Pogovor/Psevdon_im ..."
 
-#: src/gtkconv.c:2395
+#: src/gtkconv.c:2512
 msgid "/Conversation/_Block..."
 msgstr "/Pogovor/_Zavrni ..."
 
-#: src/gtkconv.c:2397
+#: src/gtkconv.c:2514
 msgid "/Conversation/_Add..."
 msgstr "/Pogovor/Dod_aj ..."
 
-#: src/gtkconv.c:2399
+#: src/gtkconv.c:2516
 msgid "/Conversation/_Remove..."
 msgstr "/Pogovor/Odst_rani ..."
 
-#: src/gtkconv.c:2404
+#: src/gtkconv.c:2521
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Pogovor/Vstavi _povezavo ..."
 
-#: src/gtkconv.c:2406
+#: src/gtkconv.c:2523
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Pogovor/Vstavi _sliko ..."
 
-#: src/gtkconv.c:2411
+#: src/gtkconv.c:2528
 msgid "/Conversation/_Close"
 msgstr "/Pogovor/_Zapri"
 
 #. Options
-#: src/gtkconv.c:2415
+#: src/gtkconv.c:2532
 msgid "/_Options"
 msgstr "/M_o転nosti"
 
-#: src/gtkconv.c:2416
+#: src/gtkconv.c:2533
 msgid "/Options/Enable _Logging"
 msgstr "/Mo転nosti/Vk_lju�i dnevnik"
 
-#: src/gtkconv.c:2417
+#: src/gtkconv.c:2534
 msgid "/Options/Enable _Sounds"
 msgstr "/Mo転nosti/Vklju�i _zvoke"
 
-#: src/gtkconv.c:2418
+#: src/gtkconv.c:2535
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Mo転nosti/Prika転i orodno vrstico za _oblikovanje"
 
-#: src/gtkconv.c:2419
+#: src/gtkconv.c:2536
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Mo転nosti/Pr_ika転i �asovne 転ige"
 
-#: src/gtkconv.c:2420
+#: src/gtkconv.c:2537
 msgid "/Options/Show Buddy _Icon"
 msgstr "/Mo転nosti/Prika転i ikono prijatelja"
 
-#: src/gtkconv.c:2460
+#: src/gtkconv.c:2577
 msgid "/Conversation/View Log"
 msgstr "/Pogovor/Prika転i dnevnik ..."
 
-#: src/gtkconv.c:2466
+#: src/gtkconv.c:2583
 msgid "/Conversation/Send File..."
 msgstr "/Pogovor/Po邸lji datoteko ..."
 
-#: src/gtkconv.c:2470
+#: src/gtkconv.c:2587
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Pogovor/Dodaj opozorilo prijatelja ..."
 
-#: src/gtkconv.c:2476
+#: src/gtkconv.c:2593
 msgid "/Conversation/Get Info"
 msgstr "/Pogovor/Informacije"
 
-#: src/gtkconv.c:2480
+#: src/gtkconv.c:2597
 msgid "/Conversation/Invite..."
 msgstr "/Pogovor/Povabi ..."
 
-#: src/gtkconv.c:2486
+#: src/gtkconv.c:2603
 msgid "/Conversation/Alias..."
 msgstr "/Pogovor/Psevdonim ..."
 
-#: src/gtkconv.c:2490
+#: src/gtkconv.c:2607
 msgid "/Conversation/Block..."
 msgstr "/Pogovor/Zavrni ..."
 
-#: src/gtkconv.c:2494
+#: src/gtkconv.c:2611
 msgid "/Conversation/Add..."
 msgstr "/Pogovor/Dodaj ..."
 
-#: src/gtkconv.c:2498
+#: src/gtkconv.c:2615
 msgid "/Conversation/Remove..."
 msgstr "/Pogovor/Odstrani ..."
 
-#: src/gtkconv.c:2504
+#: src/gtkconv.c:2621
 msgid "/Conversation/Insert Link..."
 msgstr "/Pogovor/Vstavi povezavo ..."
 
-#: src/gtkconv.c:2508
+#: src/gtkconv.c:2625
 msgid "/Conversation/Insert Image..."
 msgstr "/Pogovor/Vstavi sliko ..."
 
-#: src/gtkconv.c:2514
+#: src/gtkconv.c:2631
 msgid "/Options/Enable Logging"
 msgstr "/Mo転nosti/Vklju�i dnevnik"
 
-#: src/gtkconv.c:2517
+#: src/gtkconv.c:2634
 msgid "/Options/Enable Sounds"
 msgstr "/Mo転nosti/Vklju�i zvoke"
 
-#: src/gtkconv.c:2520
+#: src/gtkconv.c:2637
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Mo転nosti/Prika転i orodno vrstico za oblikovanje"
 
-#: src/gtkconv.c:2523
+#: src/gtkconv.c:2640
 msgid "/Options/Show Timestamps"
 msgstr "/Mo転nosti/Prika転i �asovne 転ige"
 
-#: src/gtkconv.c:2526
+#: src/gtkconv.c:2643
 msgid "/Options/Show Buddy Icon"
 msgstr "/Mo転nosti/Prika転i ikono prijatelja"
 
-#: src/gtkconv.c:2597
+#: src/gtkconv.c:2715
 msgid "User is typing..."
 msgstr "Uporabnik tipka ..."
 
-#: src/gtkconv.c:2602
-msgid "User has typed something and paused"
+#: src/gtkconv.c:2718
+msgid "User has typed something and stopped"
 msgstr "Uporabnik je napisal nekaj in se ustavil."
 
 #. Build the Send As menu
-#: src/gtkconv.c:2740
+#: src/gtkconv.c:2867
 msgid "_Send To"
 msgstr "_Po邸lji k"
 
-#: src/gtkconv.c:3373
+#: src/gtkconv.c:3498
+#: src/protocols/sametime/sametime.c:3534
 msgid "Topic:"
 msgstr "Tema:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3421
+#: src/gtkconv.c:3546
 msgid "0 people in room"
 msgstr "0 ljudi v sobi"
 
-#: src/gtkconv.c:3500
+#: src/gtkconv.c:3625
 msgid "IM the user"
 msgstr "Po邸lji sporo�ilo uporabniku"
 
-#: src/gtkconv.c:3513
+#: src/gtkconv.c:3638
 msgid "Ignore the user"
 msgstr "Prezri uporabnika"
 
-#: src/gtkconv.c:3525
+#: src/gtkconv.c:3650
 msgid "Get the user's information"
 msgstr "Poizvedi o uporabniku"
 
-#: src/gtkconv.c:4360 src/gtkconv.c:4462 src/gtkconv.c:4517
+#: src/gtkconv.c:4509
+#: src/gtkconv.c:4614
+#: src/gtkconv.c:4669
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
@@ -2699,64 +3087,56 @@
 msgstr[2] "%d osebi v sobi"
 msgstr[3] "%d osebe v sobi"
 
-#: src/gtkconv.c:5582
-msgid ""
-"say &lt;message&gt;:  Send a message normally as if you weren't using a "
-"command."
-msgstr ""
-"say &lt;sporo�ilo&gt;:  Po邸lji sporo�ilo kot ponavadi, kot �e ne bi "
-"uporabljal ukaza."
-
-#: src/gtkconv.c:5585
+#: src/gtkconv.c:5887
+msgid "say &lt;message&gt;:  Send a message normally as if you weren't using a command."
+msgstr "say &lt;sporo�ilo&gt;:  Po邸lji sporo�ilo kot ponavadi, kot �e ne bi uporabljal ukaza."
+
+#: src/gtkconv.c:5890
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
-msgstr ""
-"me &lt;dejanje&gt;:  Po邸lji prijatelju ali klepetu dejanje v slogu IRC-a."
-
-#: src/gtkconv.c:5588
-msgid ""
-"debug &lt;option&gt;:  Send various debug information to the current "
-"conversation."
-msgstr ""
-"razro邸�i &lt;mo転nost&gt;:  Trenutnim pomenkom po邸lji razli�ne informacije o "
-"razhro邸�evanju."
-
-#: src/gtkconv.c:5591
+msgstr "me &lt;dejanje&gt;:  Po邸lji prijatelju ali klepetu dejanje v slogu IRC-a."
+
+#: src/gtkconv.c:5893
+msgid "debug &lt;option&gt;:  Send various debug information to the current conversation."
+msgstr "razro邸�i &lt;mo転nost&gt;:  Trenutnim pomenkom po邸lji razli�ne informacije o razhro邸�evanju."
+
+#: src/gtkconv.c:5896
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Po�isti izpisane replike pomenka."
 
-#: src/gtkconv.c:5594
+#: src/gtkconv.c:5899
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "pomo� &lt;ukaz&gt;:  Pomo� o dolo�enem ukazu."
 
-#: src/gtkconv.c:5709
+#: src/gtkconv.c:6029
 msgid "Confirm close"
 msgstr "Potrdi zaprtje"
 
-#: src/gtkconv.c:5741
+#: src/gtkconv.c:6061
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "Imate neprebrana sporo�ila. Ste prepri�ani, da 転elite zapreti okno?"
 
-#: src/gtkconv.c:6408
+#: src/gtkconv.c:6856
 msgid "Close conversation"
 msgstr "Zapri pogovor"
 
-#: src/gtkconv.c:6872
+#: src/gtkconv.c:7325
 msgid "Last created window"
 msgstr "zadnje odprto okno"
 
-#: src/gtkconv.c:6874
+#: src/gtkconv.c:7327
 msgid "Separate IM and Chat windows"
 msgstr "lo�i okna za klepet in zasebni pomenek"
 
-#: src/gtkconv.c:6876 src/gtkprefs.c:1205
+#: src/gtkconv.c:7329
+#: src/gtkprefs.c:1230
 msgid "New window"
 msgstr "novo okno"
 
-#: src/gtkconv.c:6878
+#: src/gtkconv.c:7331
 msgid "By group"
 msgstr "po skupinah"
 
-#: src/gtkconv.c:6880
+#: src/gtkconv.c:7333
 msgid "By account"
 msgstr "po vrsti ra�una"
 
@@ -2784,7 +3164,8 @@
 msgid "Pause"
 msgstr "Premor"
 
-#: src/gtkdebug.c:705 src/gtkdebug.c:706
+#: src/gtkdebug.c:705
+#: src/gtkdebug.c:706
 msgid "Timestamps"
 msgstr "Prika転i �as"
 
@@ -2796,498 +3177,516 @@
 msgid "Right click for more options."
 msgstr "Za ve� mo転nosti kliknite na desni mi邸kin gumb."
 
-#: src/gtkdialogs.c:59 src/gtkdialogs.c:90
+#: src/gtkdialogs.c:61
+#: src/gtkdialogs.c:98
 msgid "lead developer"
 msgstr "glavni razvijalec"
 
-#: src/gtkdialogs.c:60 src/gtkdialogs.c:63 src/gtkdialogs.c:64
-#: src/gtkdialogs.c:65 src/gtkdialogs.c:66 src/gtkdialogs.c:67
-#: src/gtkdialogs.c:69 src/gtkdialogs.c:70 src/gtkdialogs.c:71
-msgid "developer"
-msgstr "razvijalec"
-
-#: src/gtkdialogs.c:61
-msgid "developer & webmaster"
-msgstr "razvijalec in oskrbnik spletne strani"
-
 #: src/gtkdialogs.c:62
+#: src/gtkdialogs.c:63
+#: src/gtkdialogs.c:65
+#: src/gtkdialogs.c:67
+#: src/gtkdialogs.c:68
+#: src/gtkdialogs.c:69
+#: src/gtkdialogs.c:70
+#: src/gtkdialogs.c:72
+#: src/gtkdialogs.c:73
+msgid "developer"
+msgstr "razvijalec"
+
+#: src/gtkdialogs.c:64
 msgid "win32 port"
 msgstr "razli�ica win32"
 
-#: src/gtkdialogs.c:68
+#: src/gtkdialogs.c:66
+msgid "developer & webmaster"
+msgstr "razvijalec in oskrbnik spletne strani"
+
+#: src/gtkdialogs.c:71
 msgid "support"
 msgstr "podpora"
 
-#: src/gtkdialogs.c:88 src/gtkdialogs.c:91
+#: src/gtkdialogs.c:92
+#: src/gtkdialogs.c:93
 msgid "maintainer"
 msgstr "vzdr転evalec"
 
-#: src/gtkdialogs.c:89
+#: src/gtkdialogs.c:94
 msgid "libfaim maintainer"
 msgstr "vzdr転evalec libfaim"
 
-#: src/gtkdialogs.c:92
+#: src/gtkdialogs.c:95
+msgid "hacker and designated driver [lazy bum]"
+msgstr "heker in uradni vodja [lenoba]"
+
+#: src/gtkdialogs.c:96
 msgid "Jabber developer"
 msgstr "razvijalec podpore protokola Jabber"
 
-#: src/gtkdialogs.c:93
+#: src/gtkdialogs.c:97
 msgid "original author"
 msgstr "prvotni avtor"
 
-#: src/gtkdialogs.c:94
-msgid "hacker and designated driver [lazy bum]"
-msgstr "heker in uradni vodja [lenoba]"
-
-#: src/gtkdialogs.c:99 src/gtkdialogs.c:100 src/gtkdialogs.c:144
+#: src/gtkdialogs.c:104
+#: src/gtkdialogs.c:105
+#: src/gtkdialogs.c:152
 msgid "Bulgarian"
 msgstr "bolgarsko"
 
-#: src/gtkdialogs.c:101
-#, fuzzy
+#: src/gtkdialogs.c:106
 msgid "Bosnian"
-msgstr "romunsko"
-
-#: src/gtkdialogs.c:102 src/gtkdialogs.c:145 src/gtkdialogs.c:146
-msgid "Catalan"
-msgstr "katalonsko"
-
-#: src/gtkdialogs.c:103 src/gtkdialogs.c:147
-msgid "Czech"
-msgstr "�e邸ko"
-
-#: src/gtkdialogs.c:104
-msgid "Danish"
-msgstr "dansko"
-
-#: src/gtkdialogs.c:105 src/gtkdialogs.c:148
-msgid "German"
-msgstr "nem邸ko"
-
-#: src/gtkdialogs.c:106
-msgid "Australian English"
-msgstr "avstralsko-angle邸ko"
+msgstr "bosansko"
 
 #: src/gtkdialogs.c:107
-msgid "British English"
-msgstr "britansko-angle邸ko"
+#: src/gtkdialogs.c:153
+#: src/gtkdialogs.c:154
+msgid "Catalan"
+msgstr "katalonsko"
 
 #: src/gtkdialogs.c:108
+#: src/gtkdialogs.c:155
+msgid "Czech"
+msgstr "�e邸ko"
+
+#: src/gtkdialogs.c:109
+msgid "Danish"
+msgstr "dansko"
+
+#: src/gtkdialogs.c:110
+#: src/gtkdialogs.c:156
+msgid "German"
+msgstr "nem邸ko"
+
+#: src/gtkdialogs.c:111
+#: src/gtkdialogs.c:112
+msgid "Greek"
+msgstr "gr邸ko"
+
+#: src/gtkdialogs.c:113
+msgid "Australian English"
+msgstr "avstralsko-angle邸ko"
+
+#: src/gtkdialogs.c:114
 msgid "Canadian English"
 msgstr "kanadsko-angle邸ko"
 
-#: src/gtkdialogs.c:109 src/gtkdialogs.c:149
+#: src/gtkdialogs.c:115
+msgid "British English"
+msgstr "britansko-angle邸ko"
+
+#: src/gtkdialogs.c:116
+#: src/gtkdialogs.c:157
 msgid "Spanish"
 msgstr "邸pansko"
 
-#: src/gtkdialogs.c:110 src/gtkdialogs.c:150
+#: src/gtkdialogs.c:117
+#: src/gtkdialogs.c:158
 msgid "Finnish"
 msgstr "finsko"
 
-#: src/gtkdialogs.c:111 src/gtkdialogs.c:151
+#: src/gtkdialogs.c:118
+#: src/gtkdialogs.c:159
 msgid "French"
 msgstr "francosko"
 
-#: src/gtkdialogs.c:112
+#: src/gtkdialogs.c:119
 msgid "Hebrew"
 msgstr "hebrejsko"
 
-#: src/gtkdialogs.c:113
+#: src/gtkdialogs.c:120
 msgid "Hindi"
 msgstr "hindujsko"
 
-#: src/gtkdialogs.c:114
+#: src/gtkdialogs.c:121
 msgid "Hungarian"
 msgstr "mad転arsko"
 
-#: src/gtkdialogs.c:115 src/gtkdialogs.c:152
+#: src/gtkdialogs.c:122
+#: src/gtkdialogs.c:160
 msgid "Italian"
 msgstr "italijansko"
 
-#: src/gtkdialogs.c:116 src/gtkdialogs.c:153
+#: src/gtkdialogs.c:123
+#: src/gtkdialogs.c:161
 msgid "Japanese"
 msgstr "japonsko"
 
-#: src/gtkdialogs.c:117
+#: src/gtkdialogs.c:124
+msgid "Georgian"
+msgstr "gruzijsko"
+
+#: src/gtkdialogs.c:125
+#: src/gtkdialogs.c:162
+msgid "Korean"
+msgstr "korejsko"
+
+#: src/gtkdialogs.c:126
+msgid "Kurdish"
+msgstr "kurdsko"
+
+#: src/gtkdialogs.c:127
 msgid "Lithuanian"
 msgstr "litvansko"
 
-#: src/gtkdialogs.c:118
-msgid "Georgian"
-msgstr "gruzijsko"
-
-#: src/gtkdialogs.c:119 src/gtkdialogs.c:154
-msgid "Korean"
-msgstr "korejsko"
-
-#: src/gtkdialogs.c:120
+#: src/gtkdialogs.c:128
+msgid "Macedonian"
+msgstr "makedonsko"
+
+#: src/gtkdialogs.c:129
 msgid "Dutch, Flemish"
 msgstr "nizozemsko, flamsko"
 
-#: src/gtkdialogs.c:121
-msgid "Macedonian"
-msgstr "makedonsko"
-
-#: src/gtkdialogs.c:122
+#: src/gtkdialogs.c:130
 msgid "Norwegian"
 msgstr "norve邸ko"
 
-#: src/gtkdialogs.c:123 src/gtkdialogs.c:124 src/gtkdialogs.c:155
+#: src/gtkdialogs.c:131
+#: src/gtkdialogs.c:132
+#: src/gtkdialogs.c:163
 msgid "Polish"
 msgstr "poljsko"
 
-#: src/gtkdialogs.c:125
+#: src/gtkdialogs.c:133
 msgid "Portuguese"
 msgstr "portugalsko"
 
-#: src/gtkdialogs.c:126
+#: src/gtkdialogs.c:134
 msgid "Portuguese-Brazil"
 msgstr "portugalsko (Brazilija)"
 
-#: src/gtkdialogs.c:127
+#: src/gtkdialogs.c:135
 msgid "Romanian"
 msgstr "romunsko"
 
-#: src/gtkdialogs.c:128 src/gtkdialogs.c:156 src/gtkdialogs.c:157
+#: src/gtkdialogs.c:136
+#: src/gtkdialogs.c:164
+#: src/gtkdialogs.c:165
 msgid "Russian"
 msgstr "rusko"
 
-#: src/gtkdialogs.c:129 src/gtkdialogs.c:130
+#: src/gtkdialogs.c:137
+#: src/gtkdialogs.c:138
 msgid "Serbian"
 msgstr "srbsko"
 
-#: src/gtkdialogs.c:131
+#: src/gtkdialogs.c:139
 msgid "Slovenian"
 msgstr "slovensko"
 
-#: src/gtkdialogs.c:132 src/gtkdialogs.c:159
+#: src/gtkdialogs.c:140
+#: src/gtkdialogs.c:167
 msgid "Swedish"
 msgstr "邸vedsko"
 
-#: src/gtkdialogs.c:133
+#: src/gtkdialogs.c:141
 msgid "Telugu"
 msgstr "telu邸ko"
 
-#: src/gtkdialogs.c:134
+#: src/gtkdialogs.c:142
 msgid "Vietnamese"
 msgstr "vietnamsko"
 
-#: src/gtkdialogs.c:134
+#: src/gtkdialogs.c:142
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh in ekipa Gnome-Vi"
 
-#: src/gtkdialogs.c:135 src/gtkdialogs.c:160
+#: src/gtkdialogs.c:143
+#: src/gtkdialogs.c:168
 msgid "Simplified Chinese"
 msgstr "poenostavljeno kitajsko"
 
-#: src/gtkdialogs.c:136 src/gtkdialogs.c:137 src/gtkdialogs.c:161
+#: src/gtkdialogs.c:144
+#: src/gtkdialogs.c:145
+#: src/gtkdialogs.c:169
 msgid "Traditional Chinese"
 msgstr "tradicionalno kitajsko"
 
-#: src/gtkdialogs.c:143
+#: src/gtkdialogs.c:151
 msgid "Amharic"
 msgstr "amharsko"
 
-#: src/gtkdialogs.c:158
+#: src/gtkdialogs.c:166
 msgid "Slovak"
 msgstr "slova邸ko"
 
-#: src/gtkdialogs.c:202
+#: src/gtkdialogs.c:210
 msgid "About Gaim"
 msgstr "O programu Gaim"
 
-#: src/gtkdialogs.c:226
-msgid ""
-"Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
-msgstr ""
-"Gaim je modularen odjemalec za neposredna sporo�ila, ki lahko hkrati "
-"uporablja protokole AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell "
-"GroupWise, Napster, Zephyr in Gadu-Gadu. Uporablja Gtk+ in je objavljen pod "
-"licenco GNU GPL.<BR><BR>"
-
-#: src/gtkdialogs.c:235
+#: src/gtkdialogs.c:234
+msgid "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all at once.  It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
+msgstr "Gaim je modularen odjemalec za neposredna sporo�ila, ki lahko hkrati uporablja protokole AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr in Gadu-Gadu. Uporablja Gtk+ in je objavljen pod licenco GNU GPL.<BR><BR>"
+
+#: src/gtkdialogs.c:243
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim na irc.freenode.net<BR><BR>"
 
-#: src/gtkdialogs.c:238
+#: src/gtkdialogs.c:246
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #gaim na irc.freenode.net<BR><BR>"
 
-#: src/gtkdialogs.c:244
+#: src/gtkdialogs.c:252
 msgid "Active Developers"
 msgstr "Aktivni razvijalci"
 
-#: src/gtkdialogs.c:259
+#: src/gtkdialogs.c:267
 msgid "Crazy Patch Writers"
 msgstr "Nori razvijalci obli転ev"
 
-#: src/gtkdialogs.c:274
+#: src/gtkdialogs.c:282
 msgid "Retired Developers"
 msgstr "Upokojeni razvijalci"
 
-#: src/gtkdialogs.c:289
+#: src/gtkdialogs.c:297
 msgid "Current Translators"
 msgstr "Trenutni prevajalci"
 
-#: src/gtkdialogs.c:309
+#: src/gtkdialogs.c:317
 msgid "Past Translators"
 msgstr "Nekdanji prevajalci"
 
-#: src/gtkdialogs.c:327
+#: src/gtkdialogs.c:335
 msgid "Debugging Information"
 msgstr "Informacije za razhro邸�evanje"
 
-#: src/gtkdialogs.c:489 src/gtkdialogs.c:630 src/gtkdialogs.c:685
+#: src/gtkdialogs.c:509
+#: src/gtkdialogs.c:646
+#: src/gtkdialogs.c:713
 msgid "_Name"
 msgstr "_Ime"
 
-#: src/gtkdialogs.c:494 src/gtkdialogs.c:635 src/gtkdialogs.c:690
+#: src/gtkdialogs.c:514
+#: src/gtkdialogs.c:651
+#: src/gtkdialogs.c:718
 msgid "_Account"
 msgstr "_Ra�un"
 
-#: src/gtkdialogs.c:502
+#: src/gtkdialogs.c:522
 msgid "New Instant Message"
 msgstr "Novo neposredno sporo�ilo"
 
-#: src/gtkdialogs.c:504
-msgid ""
-"Please enter the screen name or alias of the person you would like to IM."
+#: src/gtkdialogs.c:524
+msgid "Please enter the screen name or alias of the person you would like to IM."
 msgstr "Vnesite vzdevek osebe, ki ji 転elite poslati neposredno sporo�ilo."
 
-#: src/gtkdialogs.c:643
+#: src/gtkdialogs.c:659
 msgid "Get User Info"
 msgstr "Informacije o uporabniku"
 
-#: src/gtkdialogs.c:645
-msgid ""
-"Please enter the screen name or alias of the person whose info you would "
-"like to view."
+#: src/gtkdialogs.c:661
+msgid "Please enter the screen name or alias of the person whose info you would like to view."
 msgstr "Vnesite vzdevek osebe, o kateri si 転elite ogledati podatke."
 
-#: src/gtkdialogs.c:699
+#: src/gtkdialogs.c:727
 msgid "View User Log"
 msgstr "Prika転i uporabni邸ki dnevnik"
 
-#: src/gtkdialogs.c:701
-msgid ""
-"Please enter the screen name or alias of the person whose log you would like "
-"to view."
+#: src/gtkdialogs.c:729
+msgid "Please enter the screen name or alias of the person whose log you would like to view."
 msgstr "Vnesite vzdevek osebe, o kateri 転elite pridobiti dnevnik."
 
-#: src/gtkdialogs.c:720
+#: src/gtkdialogs.c:748
 msgid "Alias Contact"
 msgstr "Psevdonim stika"
 
-#: src/gtkdialogs.c:721
+#: src/gtkdialogs.c:749
 msgid "Enter an alias for this contact."
 msgstr "Vnesite psevdonim za ta pomenek."
 
-#: src/gtkdialogs.c:723 src/gtkdialogs.c:745 src/gtkdialogs.c:765
-#: src/gtkrequest.c:269 src/protocols/silc/chat.c:585
+#: src/gtkdialogs.c:751
+#: src/gtkdialogs.c:773
+#: src/gtkdialogs.c:793
+#: src/gtkrequest.c:295
+#: src/protocols/silc/chat.c:586
 msgid "Alias"
 msgstr "Psevdonim"
 
-#: src/gtkdialogs.c:741
+#: src/gtkdialogs.c:769
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Vnesite psevdonim za %s."
 
-#: src/gtkdialogs.c:743
+#: src/gtkdialogs.c:771
 msgid "Alias Buddy"
 msgstr "Psevdonim prijatelja"
 
-#: src/gtkdialogs.c:762
+#: src/gtkdialogs.c:790
 msgid "Alias Chat"
 msgstr "Psevdonim pomenka"
 
-#: src/gtkdialogs.c:763
+#: src/gtkdialogs.c:791
 msgid "Enter an alias for this chat."
 msgstr "Vnesite psevdonim za ta pomenek."
 
-#: src/gtkdialogs.c:800
-#, c-format
-msgid ""
-"You are about to remove the contact containing %s and %d other buddy from "
-"your buddy list.  Do you want to continue?"
-msgid_plural ""
-"You are about to remove the contact containing %s and %d other buddies from "
-"your buddy list.  Do you want to continue?"
-msgstr[0] ""
-"S seznama prijateljev boste odstranili stik, ki vsebuje %s in %d drugih "
-"prijateljev. Ali 転elite nadaljevati?"
-msgstr[1] ""
-"S seznama prijateljev boste odstranili stik, ki vsebuje %s in %d drugega "
-"prijatelja. Ali 転elite nadaljevati?"
-msgstr[2] ""
-"S seznama prijateljev boste odstranili stik, ki vsebuje %s in %d druga "
-"prijatelja. Ali 転elite nadaljevati?"
-msgstr[3] ""
-"S seznama prijateljev boste odstranili stik, ki vsebuje %s in %d druge "
-"prijatelje. Ali 転elite nadaljevati?"
-
-#: src/gtkdialogs.c:867
-#, c-format
-msgid ""
-"You are about to remove the group %s and all its members from your buddy "
-"list.  Do you want to continue?"
-msgstr ""
-"S seznama prijateljev boste odstranili skupino %s. Ali 転elite nadaljevati?"
-
-#: src/gtkdialogs.c:870 src/gtkdialogs.c:871
+#: src/gtkdialogs.c:828
+#, c-format
+msgid "You are about to remove the contact containing %s and %d other buddy from your buddy list.  Do you want to continue?"
+msgid_plural "You are about to remove the contact containing %s and %d other buddies from your buddy list.  Do you want to continue?"
+msgstr[0] "S seznama prijateljev boste odstranili stik, ki vsebuje %s in %d drugih prijateljev. Ali 転elite nadaljevati?"
+msgstr[1] "S seznama prijateljev boste odstranili stik, ki vsebuje %s in %d drugega prijatelja. Ali 転elite nadaljevati?"
+msgstr[2] "S seznama prijateljev boste odstranili stik, ki vsebuje %s in %d druga prijatelja. Ali 転elite nadaljevati?"
+msgstr[3] "S seznama prijateljev boste odstranili stik, ki vsebuje %s in %d druge prijatelje. Ali 転elite nadaljevati?"
+
+#: src/gtkdialogs.c:895
+#, c-format
+msgid "You are about to remove the group %s and all its members from your buddy list.  Do you want to continue?"
+msgstr "S seznama prijateljev boste odstranili skupino %s. Ali 転elite nadaljevati?"
+
+#: src/gtkdialogs.c:898
+#: src/gtkdialogs.c:899
 msgid "Remove Group"
 msgstr "Odstrani skupino"
 
-#: src/gtkdialogs.c:909
-#, c-format
-msgid ""
-"You are about to remove %s from your buddy list.  Do you want to continue?"
+#: src/gtkdialogs.c:937
+#, c-format
+msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Odstranili boste %s s seznama prijateljev. Ali 転elite nadaljevati?"
 
-#: src/gtkdialogs.c:912 src/gtkdialogs.c:913
+#: src/gtkdialogs.c:940
+#: src/gtkdialogs.c:941
 msgid "Remove Buddy"
 msgstr "Odstrani prijatelja"
 
-#: src/gtkdialogs.c:951
-#, c-format
-msgid ""
-"You are about to remove the chat %s from your buddy list.  Do you want to "
-"continue?"
-msgstr ""
-"S seznama prijateljev boste odstranili pomenek %s. Ali 転elite nadaljevati?"
-
-#: src/gtkdialogs.c:954 src/gtkdialogs.c:955
+#: src/gtkdialogs.c:979
+#, c-format
+msgid "You are about to remove the chat %s from your buddy list.  Do you want to continue?"
+msgstr "S seznama prijateljev boste odstranili pomenek %s. Ali 転elite nadaljevati?"
+
+#: src/gtkdialogs.c:982
+#: src/gtkdialogs.c:983
 msgid "Remove Chat"
 msgstr "Odstrani pomenek"
 
-#: src/gtkft.c:138
+#: src/gtkft.c:139
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KB/s"
 
-#: src/gtkft.c:159 src/gtkft.c:1035
+#: src/gtkft.c:160
+#: src/gtkft.c:1049
 msgid "Finished"
 msgstr "Kon�ano"
 
-#: src/gtkft.c:162 src/gtkft.c:986
+#: src/gtkft.c:163
+#: src/gtkft.c:989
 msgid "Canceled"
 msgstr "Preklicano"
 
-#: src/gtkft.c:165 src/gtkft.c:905
+#: src/gtkft.c:166
+#: src/gtkft.c:908
 msgid "Waiting for transfer to begin"
 msgstr "�akanje na za�etek prenosa"
 
-#: src/gtkft.c:218
+#: src/gtkft.c:220
 msgid "<b>Receiving As:</b>"
 msgstr "<b>Sprejemam kot:</b>"
 
-#: src/gtkft.c:220
+#: src/gtkft.c:222
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Sprejemam od:</b>"
 
-#: src/gtkft.c:224
+#: src/gtkft.c:226
 msgid "<b>Sending To:</b>"
 msgstr "<b>Po邸iljam k:</b>"
 
-#: src/gtkft.c:226
+#: src/gtkft.c:228
 msgid "<b>Sending As:</b>"
 msgstr "<b>Po邸iljam kot:</b>"
 
-#: src/gtkft.c:442
+#: src/gtkft.c:444
 msgid "There is no application configured to open this type of file."
 msgstr "Za odpiranje datotek te vrste ni nastavljen noben program."
 
-#: src/gtkft.c:447
+#: src/gtkft.c:449
 msgid "An error occurred while opening the file."
 msgstr "Med odpiranjem datoteke je pri邸lo do napake."
 
-#: src/gtkft.c:467
+#: src/gtkft.c:469
 #, c-format
 msgid "Error launching %s: %s"
 msgstr "Napaka pri zagonu %s: %s"
 
-#: src/gtkft.c:476
+#: src/gtkft.c:478
 #, c-format
 msgid "Error running %s"
 msgstr "Napaka pri uporabi %s"
 
-#: src/gtkft.c:477
+#: src/gtkft.c:479
 #, c-format
 msgid "Process returned error code %d"
 msgstr "Proces je vrnil kodo napake %d"
 
-#: src/gtkft.c:572
+#: src/gtkft.c:574
 msgid "Progress"
 msgstr "Potek"
 
-#: src/gtkft.c:579
+#: src/gtkft.c:581
 msgid "Filename"
 msgstr "Datoteka"
 
-#: src/gtkft.c:586
+#: src/gtkft.c:588
 msgid "Size"
 msgstr "Velikost"
 
-#: src/gtkft.c:593
+#: src/gtkft.c:595
 msgid "Remaining"
 msgstr "Preostanek"
 
-#: src/gtkft.c:624
+#: src/gtkft.c:626
 msgid "Filename:"
 msgstr "Datoteka:"
 
-#: src/gtkft.c:625
-msgid "Local File:"
-msgstr "Lokalna datoteka:"
-
-#: src/gtkft.c:626
-msgid "Status:"
-msgstr "Stanje:"
-
 #: src/gtkft.c:627
-msgid "Speed:"
-msgstr "Hitrost:"
+msgid "Local File:"
+msgstr "Lokalna datoteka:"
 
 #: src/gtkft.c:628
+msgid "Status:"
+msgstr "Stanje:"
+
+#: src/gtkft.c:629
+msgid "Speed:"
+msgstr "Hitrost:"
+
+#: src/gtkft.c:630
 msgid "Time Elapsed:"
 msgstr "Porabljen �as:"
 
-#: src/gtkft.c:629
+#: src/gtkft.c:631
 msgid "Time Remaining:"
 msgstr "Preostali �as:"
 
-#: src/gtkft.c:715
-msgid "_Keep the dialog open"
-msgstr "_Ohrani okno odprto"
-
-#: src/gtkft.c:725
-#, fuzzy
+#: src/gtkft.c:717
+msgid "_Close this window when all transfers finish"
+msgstr "_Zapri to okno po zaklju�ku vseh prenosov"
+
+#: src/gtkft.c:727
 msgid "C_lear finished transfers"
-msgstr "_Izbri邸i dokon�ane prenose"
+msgstr "_Po�isti dokon�ane prenose"
 
 #. "Download Details" arrow
-#: src/gtkft.c:734
-#, fuzzy
+#: src/gtkft.c:736
 msgid "File transfer _details"
-msgstr "Skrij podrobnosti o prenosu"
+msgstr "Po_drobnosti o prenosu"
 
 #. Pause button
-#: src/gtkft.c:764 src/gtkstock.c:122
+#: src/gtkft.c:766
+#: src/gtkstock.c:143
 msgid "_Pause"
 msgstr "_Premor"
 
 #. Resume button
-#: src/gtkft.c:774
+#: src/gtkft.c:776
 msgid "_Resume"
 msgstr "_Nadaljuj"
 
-#: src/gtkft.c:988
+#: src/gtkft.c:991
 msgid "Failed"
 msgstr "Neuspeh"
 
 #: src/gtkimhtml.c:816
-msgid "Pa_ste As Text"
-msgstr "Prilepi kot be_sedilo"
+msgid "Pa_ste as Plain Text"
+msgstr "Prilepi kot navadno be_sedilo"
 
 #: src/gtkimhtml.c:1313
 msgid "Hyperlink color"
@@ -3317,7 +3716,7 @@
 msgid "_Copy Link Location"
 msgstr "_Kopiraj lokacijo povezave"
 
-#: src/gtkimhtml.c:3234
+#: src/gtkimhtml.c:3241
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -3327,7 +3726,7 @@
 "\n"
 "Uporabljena bo privzeta vrednost PNG."
 
-#: src/gtkimhtml.c:3237
+#: src/gtkimhtml.c:3244
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -3337,7 +3736,7 @@
 "\n"
 "Uporabljena bo privzeta vrednost PNG."
 
-#: src/gtkimhtml.c:3250
+#: src/gtkimhtml.c:3257
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -3348,7 +3747,7 @@
 "\n"
 "%s"
 
-#: src/gtkimhtml.c:3253
+#: src/gtkimhtml.c:3260
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -3359,11 +3758,12 @@
 "\n"
 "%s"
 
-#: src/gtkimhtml.c:3333 src/gtkimhtml.c:3345
+#: src/gtkimhtml.c:3340
+#: src/gtkimhtml.c:3352
 msgid "Save Image"
 msgstr "Shrani sliko"
 
-#: src/gtkimhtml.c:3373
+#: src/gtkimhtml.c:3380
 msgid "_Save Image..."
 msgstr "_Shrani sliko ..."
 
@@ -3388,9 +3788,7 @@
 msgstr "_Opis"
 
 #: src/gtkimhtmltoolbar.c:405
-msgid ""
-"Please enter the URL and description of the link that you want to insert. "
-"The description is optional."
+msgid "Please enter the URL and description of the link that you want to insert. The description is optional."
 msgstr "Vnesite URL in opis povezave, ki jo 転elite vstaviti. Opis ni obvezen."
 
 #: src/gtkimhtmltoolbar.c:409
@@ -3410,7 +3808,8 @@
 msgid "Failed to store image: %s\n"
 msgstr "Slike: %s ni mogo�e shraniti.\n"
 
-#: src/gtkimhtmltoolbar.c:513 src/gtkimhtmltoolbar.c:523
+#: src/gtkimhtmltoolbar.c:513
+#: src/gtkimhtmltoolbar.c:523
 msgid "Insert Image"
 msgstr "Vstavi sliko"
 
@@ -3451,10 +3850,6 @@
 msgid "Foreground font color"
 msgstr "Barva pisave"
 
-#: src/gtkimhtmltoolbar.c:1007
-msgid "Background color"
-msgstr "Barva ozadja"
-
 #: src/gtkimhtmltoolbar.c:1023
 msgid "Clear formatting"
 msgstr "Po�isti oblikovanje"
@@ -3471,72 +3866,58 @@
 msgid "Insert smiley"
 msgstr "Vstavi sme邸kota"
 
-#: src/gtklog.c:200
+#: src/gtklog.c:212
 #, c-format
 msgid "Conversation in %s on %s"
 msgstr "Pomenki v %s o %s"
 
-#: src/gtklog.c:202
+#: src/gtklog.c:214
 #, c-format
 msgid "Conversation with %s on %s"
 msgstr "Pomenki z %s o %s"
 
-#: src/gtklog.c:309
-#, fuzzy
-msgid ""
-"System events will only be logged if the \"Log all status changes to system "
-"log\" preference is enabled."
-msgstr ""
-"Sistemski dogodki bodo shranjeni, le �e bo nastavljena mo転nost <span style="
-"\"italic\">Omogo�i sistemski dnevnik</span>."
-
-#: src/gtklog.c:313
-#, fuzzy
-msgid ""
-"Instant messages will only be logged if the \"Log all instant messages\" "
-"preference is enabled."
-msgstr ""
-"Neposredna sporo�ila se bodo shranila, le �e bo okljukana mo転nost <span "
-"style=\"italic\">Shranjuj vsa neposredna sporo�ila</span>."
-
-#: src/gtklog.c:316
-#, fuzzy
-msgid ""
-"Chats will only be logged if the \"Log all chats preference\" is enabled."
-msgstr ""
-"Pomenki bodo shranjeni v dnevnik, ko je okljukana mo転nost <span style="
-"\"italic\">Shranjuj vse pomenke</span>."
-
-#: src/gtklog.c:320
-#, fuzzy
+#: src/gtklog.c:324
+msgid "System events will only be logged if the \"Log all status changes to system log\" preference is enabled."
+msgstr "Sistemski dogodki bodo shranjeni, le �e bo nastavljena mo転nost \"Omogo�i sistemski dnevnik\"."
+
+#: src/gtklog.c:328
+msgid "Instant messages will only be logged if the \"Log all instant messages\" preference is enabled."
+msgstr "Neposredna sporo�ila se bodo shranila, le �e bo okljukana mo転nost \"Shranjuj vsa neposredna sporo�ila\"."
+
+#: src/gtklog.c:331
+msgid "Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgstr "Pomenki bodo shranjeni v dnevnik, ko je okljukana mo転nost \"Shranjuj vse pomenke\"."
+
+#: src/gtklog.c:335
 msgid "No logs were found"
 msgstr "Ni najdenih dnevnikov."
 
-#: src/gtklog.c:396
+#: src/gtklog.c:411
 msgid "Total log size:"
 msgstr "Skupna velikost dnevnika:"
 
-#: src/gtklog.c:472
+#: src/gtklog.c:487
 #, c-format
 msgid "Conversations in %s"
 msgstr "Pomenki v %s"
 
-#: src/gtklog.c:480 src/gtklog.c:531
+#: src/gtklog.c:495
+#: src/gtklog.c:546
 #, c-format
 msgid "Conversations with %s"
 msgstr "Pomenki z %s"
 
-#: src/gtklog.c:556
+#: src/gtklog.c:571
 msgid "System Log"
 msgstr "Sistemski dnevnik"
 
-#: src/gtkmain.c:326
+#: src/gtkmain.c:324
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s. Poskusi '%s -h' za ve� informacij.\n"
 
-#: src/gtkmain.c:328
-#, fuzzy, c-format
+#: src/gtkmain.c:326
+#, c-format
 msgid ""
 "Gaim %s\n"
 "Usage: %s [OPTION]...\n"
@@ -3552,7 +3933,6 @@
 "Gaim %s\n"
 "Uporaba: %s [MO貼NOST]...\n"
 "\n"
-"  -a, --acct          prika転i okno urejevalnika ra�unov\n"
 "  -c, --config=DIR    uporabi DIR za nastavitvene datoteke\n"
 "  -d, --debug         izpi邸i sporo�ila za razhro邸�evanje na stdout\n"
 "  -h, --help          izpi邸i to pomo� in kon�aj program\n"
@@ -3561,17 +3941,49 @@
 "                     dolo�a ra�un(e) za prijavo, lo�ene z vejico)\n"
 "  -v, --version       izpi邸i trenutno razli�ico in kon�aj program\n"
 
-#. TODO: Should save the previous status as a transient status?
-#. Save the newly selected status to prefs.xml and status.xml
-#: src/gtkmain.c:676 src/gtkmain.c:678 src/gtkmain.c:681
-#: src/gtkstatusbox.c:663 src/gtkstatusbox.c:665 src/gtkstatusbox.c:668
-#: src/status.c:1696
-#, fuzzy
+#: src/gtkmain.c:682
+#: src/gtkmain.c:684
 msgid "Default"
-msgstr "Privzeto za Gnome"
+msgstr "Privzeto"
+
+#: src/gtkmedia.c:52
+msgid "Call ended."
+msgstr "Klic kon�an."
+
+#: src/gtkmedia.c:69
+#, c-format
+msgid "Calling %s"
+msgstr "Klicanje %s"
+
+#: src/gtkmedia.c:73
+#: src/gtkmedia.c:108
+msgid "End Call"
+msgstr "Kon�aj klic"
+
+#: src/gtkmedia.c:81
+#, c-format
+msgid "Receiving call from %s"
+msgstr "Sprejemanje klica od %s"
+
+#: src/gtkmedia.c:89
+msgid "Reject Call"
+msgstr "Zavrni klic"
+
+#: src/gtkmedia.c:95
+msgid "Accept call"
+msgstr "Sprejmi klic"
+
+#: src/gtkmedia.c:102
+#, c-format
+msgid "Connected to %s"
+msgstr "Povezani s/z %s"
+
+#: src/gtkmedia.c:113
+msgid "_Mute"
+msgstr "Ne_mo"
 
 #. Descriptive label
-#: src/gtknotify.c:275
+#: src/gtknotify.c:277
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
@@ -3580,17 +3992,17 @@
 msgstr[2] "%s ima %d novi sporo�ili."
 msgstr[3] "%s ima %d nova sporo�ila."
 
-#: src/gtknotify.c:289
+#: src/gtknotify.c:291
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">Zadeva:</span> %s\n"
 
-#: src/gtknotify.c:298
+#: src/gtknotify.c:300
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">Zadeva:</span> %s\n"
 
-#: src/gtknotify.c:303
+#: src/gtknotify.c:305
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3601,7 +4013,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:319
+#: src/gtknotify.c:321
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3612,399 +4024,434 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:504
+#: src/gtknotify.c:507
 msgid "Search Results"
 msgstr "Rezultati iskanja"
 
-#: src/gtknotify.c:643 src/protocols/oscar/oscar.c:4858
+#: src/gtknotify.c:648
+#: src/protocols/oscar/oscar.c:4860
 #, c-format
 msgid "Info for %s"
 msgstr "Podatki za %s"
 
-#: src/gtknotify.c:644 src/protocols/toc/toc.c:470
+#: src/gtknotify.c:649
+#: src/protocols/toc/toc.c:470
 msgid "Buddy Information"
 msgstr "Informacije o prijatelju"
 
-#: src/gtknotify.c:687
+#: src/gtknotify.c:695
 #, c-format
 msgid "The browser command <b>%s</b> is invalid."
 msgstr "Ukaz brskalnika <b>%s</b> ni veljaven."
 
-#: src/gtknotify.c:689 src/gtknotify.c:701 src/gtknotify.c:714
-#: src/gtknotify.c:838
+#: src/gtknotify.c:697
+#: src/gtknotify.c:709
+#: src/gtknotify.c:722
+#: src/gtknotify.c:846
 msgid "Unable to open URL"
 msgstr "Ni bilo mogo�e odprti URL"
 
-#: src/gtknotify.c:699 src/gtknotify.c:712
+#: src/gtknotify.c:707
+#: src/gtknotify.c:720
 #, c-format
 msgid "Error launching <b>%s</b>: %s"
 msgstr "Napaka pri zaganjanju <b>%s</b>: %s"
 
-#: src/gtknotify.c:839
+#: src/gtknotify.c:847
+msgid "The 'Manual' browser command has been chosen, but no command has been set."
+msgstr "Va邸ega brskalnika ni bilo mogo�e zagnati, ker ste v nastavitvah izbrali poljuben brskalnik, a niste nastavili ukaza."
+
+#: src/gtkplugin.c:258
+#, c-format
 msgid ""
-"The 'Manual' browser command has been chosen, but no command has been set."
+"%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
+"<span weight=\"bold\">Web site:</span>\t\t%s\n"
+"<span weight=\"bold\">File name:</span>\t%s"
 msgstr ""
-"Va邸ega brskalnika ni bilo mogo�e zagnati, ker ste v nastavitvah izbrali "
-"poljuben brskalnik, a niste nastavili ukaza."
-
-#: src/gtkpounce.c:130
+"%s%s<span weight=\"bold\">Avtor:</span>\t%s\n"
+"<span weight=\"bold\">Spletna stran:</span>\t\t%s\n"
+"<span weight=\"bold\">Ime datoteke:</span>\t%s"
+
+#: src/gtkplugin.c:426
+msgid "<b>Plugin Details</b>"
+msgstr "<b>Podrobnosti o vstavku</b>"
+
+#: src/gtkpounce.c:157
 msgid "Select a file"
 msgstr "Izberi datoteko"
 
-#: src/gtkpounce.c:161
+#: src/gtkpounce.c:254
 msgid "Please enter a buddy to pounce."
 msgstr "Vnesite opozorilo prijatelja."
 
-#. "New Buddy Pounce"
-#: src/gtkpounce.c:391 src/gtkpounce.c:898
+#: src/gtkpounce.c:476
 msgid "New Buddy Pounce"
 msgstr "Novo opozorilo prijatelja"
 
-#: src/gtkpounce.c:391
+#: src/gtkpounce.c:476
 msgid "Edit Buddy Pounce"
 msgstr "Uredi opozorilo prijatelja"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:408
+#: src/gtkpounce.c:493
 msgid "Pounce Who"
 msgstr "Opozori koga"
 
-#: src/gtkpounce.c:435
+#: src/gtkpounce.c:520
 msgid "_Buddy name:"
 msgstr "_Ime prijatelja:"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:459
-msgid "Pounce When"
-msgstr "Opozori kdaj"
-
-#: src/gtkpounce.c:467
-msgid "Si_gn on"
-msgstr "_Prijava"
-
-#: src/gtkpounce.c:469
-msgid "Sign _off"
-msgstr "_Odjava"
-
-#: src/gtkpounce.c:471
-msgid "A_way"
-msgstr "_Odsoten"
-
-#: src/gtkpounce.c:473
-msgid "_Return from away"
-msgstr "_Vrni se"
-
-#: src/gtkpounce.c:475
-msgid "_Idle"
-msgstr "_Nedejaven"
-
-#: src/gtkpounce.c:477
-msgid "Retur_n from idle"
-msgstr "Posta_ni dejaven"
-
-#: src/gtkpounce.c:479
-msgid "Buddy starts _typing"
-msgstr "Prijatelj za�ne _tipkati"
-
-#: src/gtkpounce.c:481
-msgid "Buddy stops t_yping"
-msgstr "Prijatelj preneha t_ipkati"
+#: src/gtkpounce.c:544
+msgid "Pounce When Buddy..."
+msgstr "Opozori, ko se prijatelj ..."
+
+#: src/gtkpounce.c:552
+msgid "Si_gns on"
+msgstr "_prijavi"
+
+#: src/gtkpounce.c:554
+msgid "Signs o_ff"
+msgstr "_odjavi"
+
+#: src/gtkpounce.c:556
+msgid "Goes a_way"
+msgstr "postane od_soten"
+
+#: src/gtkpounce.c:558
+msgid "Ret_urns from away"
+msgstr "_vrne"
+
+#: src/gtkpounce.c:560
+msgid "Becomes _idle"
+msgstr "postane _nedejaven"
+
+#: src/gtkpounce.c:562
+msgid "Is no longer i_dle"
+msgstr "ni ve_� nedejaven."
+
+#: src/gtkpounce.c:564
+msgid "Starts _typing"
+msgstr "za�ne _tipkati"
+
+#: src/gtkpounce.c:566
+msgid "Stops t_yping"
+msgstr "_preneha tipkati"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:510
+#: src/gtkpounce.c:595
 msgid "Pounce Action"
 msgstr "Dejanje opozorila"
 
-#: src/gtkpounce.c:518
-msgid "Op_en an IM window"
+#: src/gtkpounce.c:603
+msgid "Ope_n an IM window"
 msgstr "Odpri no_vo sporo�ilno okno"
 
-#: src/gtkpounce.c:520
-msgid "_Popup notification"
-msgstr "_Pojavna obvestila"
-
-#: src/gtkpounce.c:522
+#: src/gtkpounce.c:605
+msgid "_Pop up a notification"
+msgstr "_Prika転i obvestilo"
+
+#: src/gtkpounce.c:607
 msgid "Send a _message"
 msgstr "Po邸lji spo_ro�ilo"
 
-#: src/gtkpounce.c:524
+#: src/gtkpounce.c:609
 msgid "E_xecute a command"
 msgstr "Izvr_邸i ukaz"
 
-#: src/gtkpounce.c:526
+#: src/gtkpounce.c:611
 msgid "P_lay a sound"
 msgstr "Pre_dvajaj zvok"
 
-#: src/gtkpounce.c:530
-msgid "B_rowse..."
-msgstr "B_rskaj ..."
-
-#: src/gtkpounce.c:532
-msgid "Bro_wse..."
-msgstr "Br_skaj ..."
-
-#: src/gtkpounce.c:533
+#: src/gtkpounce.c:615
+msgid "Brows_e..."
+msgstr "Pre_rskaj ..."
+
+#: src/gtkpounce.c:617
+msgid "Br_owse..."
+msgstr "Preb_rskaj ..."
+
+#: src/gtkpounce.c:618
 msgid "Pre_view"
 msgstr "Pred_ogled"
 
-#: src/gtkpounce.c:616
-msgid "Sav_e this pounce after activation"
-msgstr "Shran_i to opozorilo po dejanju"
-
-#. "Remove Buddy Pounce"
-#: src/gtkpounce.c:906
-msgid "Remove Buddy Pounce"
-msgstr "Odstrani opozorilo prijatelja"
-
-#: src/gtkpounce.c:964
+#: src/gtkpounce.c:701
+msgid "_Recurring"
+msgstr "Ponavl_jajo�"
+
+#: src/gtkpounce.c:997
+#, c-format
+msgid "Are you sure you want to delete the pounce on %s for %s?"
+msgstr "Ste prepri�ani, da 転elite izbrisati obvestilo o %s za %s?"
+
+#: src/gtkpounce.c:1145
+msgid "Pounce Target"
+msgstr "Tar�a opozorila"
+
+#: src/gtkpounce.c:1180
+msgid "Recurring"
+msgstr "Ponavljajo�"
+
+#: src/gtkpounce.c:1227
+msgid "Buddy Pounces"
+msgstr "Opozorila prijatelja"
+
+#: src/gtkpounce.c:1345
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s vam (%s) je za�el pisati"
 
-#: src/gtkpounce.c:966
+#: src/gtkpounce.c:1347
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s se je prijavil na (%s)"
 
-#: src/gtkpounce.c:968
+#: src/gtkpounce.c:1349
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s je spet dejaven (%s)"
 
-#: src/gtkpounce.c:970
+#: src/gtkpounce.c:1351
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s se je vrnil (%s)"
 
-#: src/gtkpounce.c:972
+#: src/gtkpounce.c:1353
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s vam (%s) je prenehal pisati"
 
-#: src/gtkpounce.c:974
+#: src/gtkpounce.c:1355
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s se je odjavil (%s)"
 
-#: src/gtkpounce.c:976
+#: src/gtkpounce.c:1357
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s je postal nedejaven (%s)"
 
-#: src/gtkpounce.c:978
+#: src/gtkpounce.c:1359
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s je postal odsoten. (%s)"
 
-#: src/gtkpounce.c:979
+#: src/gtkpounce.c:1360
 msgid "Unknown pounce event. Please report this!"
 msgstr "Neznan dogodek opozorila. Poro�ajte o tem!"
 
-#: src/gtkprefs.c:623
-msgid ""
-"Select a smiley theme that you would like to use from the list below. New "
-"themes can be installed by dragging and dropping them onto the theme list."
-msgstr ""
-"S spodnjega seznama izberite vrsto sme邸kov, ki jih 転elite uporabljati. Nove "
-"teme lahko namestite, �e jih povle�ete in spustite na seznam."
-
-#: src/gtkprefs.c:658
+#: src/gtkprefs.c:511
+msgid "Smiley theme failed to unpack."
+msgstr "Teme nasme邸kov ni mogo�e razpakirati."
+
+#: src/gtkprefs.c:630
+msgid "Select a smiley theme that you would like to use from the list below. New themes can be installed by dragging and dropping them onto the theme list."
+msgstr "S spodnjega seznama izberite vrsto sme邸kov, ki jih 転elite uporabljati. Nove teme lahko namestite, �e jih povle�ete in spustite na seznam."
+
+#: src/gtkprefs.c:665
 msgid "Icon"
 msgstr "Ikona"
 
-#: src/gtkprefs.c:665 src/protocols/jabber/buddy.c:267
-#: src/protocols/jabber/buddy.c:811 src/protocols/jabber/chat.c:769
+#: src/gtkprefs.c:672
+#: src/protocols/jabber/buddy.c:267
+#: src/protocols/jabber/buddy.c:811
+#: src/protocols/jabber/chat.c:769
 msgid "Description"
 msgstr "Opis"
 
-#: src/gtkprefs.c:805
+#: src/gtkprefs.c:814
+msgid "_Hide new IM conversations"
+msgstr "Skrij nove po_govore IM"
+
+#: src/gtkprefs.c:817
+#: src/gtkprefs.c:1666
+msgid "When away"
+msgstr "ob odsotnosti"
+
+#: src/gtkprefs.c:821
 msgid "Send unknown \"_slash\" commands as messages"
 msgstr "Po邸lji neznane ukaze \"_slash\" kot sporo�ila"
 
-#: src/gtkprefs.c:807
+#: src/gtkprefs.c:823
 msgid "Show _formatting on incoming messages"
 msgstr "Prika転i _oblikovanje v dohodnih sporo�ilih"
 
-#: src/gtkprefs.c:809
+#: src/gtkprefs.c:826
 msgid "Show buddy _icons"
 msgstr "Prika転i _ikone"
 
-#: src/gtkprefs.c:811
+#: src/gtkprefs.c:828
 msgid "Enable buddy ic_on animation"
 msgstr "_Omogo�i animacijo ikon prijateljev"
 
-#: src/gtkprefs.c:813
+#: src/gtkprefs.c:835
 msgid "_Notify buddies that you are typing to them"
 msgstr "O_bvesti prijatelje, da jim pi邸em"
 
-#: src/gtkprefs.c:816
+#: src/gtkprefs.c:838
 msgid "_Highlight misspelled words"
 msgstr "_Opozori na nepravilno �rkovane besede"
 
-#: src/gtkprefs.c:834
-msgid ""
-"This is how your outgoing message text will appear when you use protocols "
-"that support formatting. :)"
-msgstr ""
-"Tako bo izgledalo besedilo va邸ega odhodnega sporo�ila, �e uporabljate "
-"protokole, ki podpirajo oblikovanje. :)"
+#: src/gtkprefs.c:856
+msgid "This is how your outgoing message text will appear when you use protocols that support formatting. :)"
+msgstr "Tako bo izgledalo besedilo va邸ega odhodnega sporo�ila, �e uporabljate protokole, ki podpirajo oblikovanje. :)"
 
 #. All the tab options!
-#: src/gtkprefs.c:856
+#: src/gtkprefs.c:878
 msgid "Tab Options"
 msgstr "Mo転nosti zavihkov"
 
-#: src/gtkprefs.c:858
+#: src/gtkprefs.c:880
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Prika転i pogovore v _oknih z zavihki"
 
-#: src/gtkprefs.c:872
+#: src/gtkprefs.c:894
 msgid "Show close b_utton on tabs"
 msgstr "Poka転i _gumb 'Zapri' na zavihkih"
 
-#: src/gtkprefs.c:878
+#: src/gtkprefs.c:900
 msgid "_Placement:"
 msgstr "_Postavitev"
 
-#: src/gtkprefs.c:880
+#: src/gtkprefs.c:902
 msgid "Top"
 msgstr "zgoraj"
 
-#: src/gtkprefs.c:881
+#: src/gtkprefs.c:903
 msgid "Bottom"
 msgstr "spodaj"
 
-#: src/gtkprefs.c:882
+#: src/gtkprefs.c:904
 msgid "Left"
 msgstr "na levi"
 
-#: src/gtkprefs.c:883
+#: src/gtkprefs.c:905
 msgid "Right"
 msgstr "na desni"
 
-#: src/gtkprefs.c:885
+#: src/gtkprefs.c:907
 msgid "Left Vertical"
 msgstr "levo navpi�no"
 
-#: src/gtkprefs.c:886
+#: src/gtkprefs.c:908
 msgid "Right Vertical"
 msgstr "desno navpi�no"
 
-#: src/gtkprefs.c:891
+#: src/gtkprefs.c:913
 msgid "N_ew conversations:"
 msgstr "N_ovi pogovori:"
 
-#: src/gtkprefs.c:942 src/protocols/oscar/oscar.c:779
-#: src/protocols/oscar/oscar.c:5959
+#: src/gtkprefs.c:964
+#: src/protocols/oscar/oscar.c:781
+#: src/protocols/oscar/oscar.c:6008
 msgid "IP Address"
 msgstr "Naslov IP"
 
-#: src/gtkprefs.c:944
-msgid "STUN Server:"
-msgstr "Stre転nik STUN:"
-
-#: src/gtkprefs.c:946
-msgid "_Autodetect IP Address"
-msgstr "_Samozaznaj IP-naslov"
-
-#: src/gtkprefs.c:955
+#: src/gtkprefs.c:966
+msgid "ST_UN server:"
+msgstr "Stre転nik ST_UN:"
+
+#: src/gtkprefs.c:968
+msgid "_Autodetect IP address"
+msgstr "_Samozaznaj naslov IP"
+
+#: src/gtkprefs.c:977
 msgid "Public _IP:"
 msgstr "Javen _IP:"
 
-#: src/gtkprefs.c:979
+#: src/gtkprefs.c:1001
 msgid "Ports"
 msgstr "Vrata"
 
-#: src/gtkprefs.c:982
+#: src/gtkprefs.c:1004
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Ro�no dolo�i obseg vrat za poslu邸anje"
 
-#: src/gtkprefs.c:985
-msgid "_Start Port:"
+#: src/gtkprefs.c:1007
+msgid "_Start port:"
 msgstr "_Za�etna vrata:"
 
-#: src/gtkprefs.c:992
-msgid "_End Port:"
+#: src/gtkprefs.c:1014
+msgid "_End port:"
 msgstr "_Kon�na vrata:"
 
-#: src/gtkprefs.c:999
+#: src/gtkprefs.c:1022
 msgid "Proxy Server"
 msgstr "Stre転nik proxy"
 
-#: src/gtkprefs.c:1003
+#: src/gtkprefs.c:1026
 msgid "No proxy"
 msgstr "Brez stre転nika proxy"
 
-#: src/gtkprefs.c:1059
+#: src/gtkprefs.c:1082
 msgid "_User:"
 msgstr "_Uporabnik:"
 
-#: src/gtkprefs.c:1119
+#: src/gtkprefs.c:1144
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: src/gtkprefs.c:1120
+#: src/gtkprefs.c:1145
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1121
+#: src/gtkprefs.c:1146
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1122
+#: src/gtkprefs.c:1147
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1123
-#, fuzzy
+#: src/gtkprefs.c:1148
 msgid "GNOME Default"
-msgstr "Privzeto za Gnome"
-
-#: src/gtkprefs.c:1124
+msgstr "Privzeto za GNOME"
+
+#: src/gtkprefs.c:1149
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1125
+#: src/gtkprefs.c:1150
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1126
+#: src/gtkprefs.c:1151
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1127
+#: src/gtkprefs.c:1152
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1136
+#: src/gtkprefs.c:1161
 msgid "Manual"
 msgstr "Ro�ni"
 
-#: src/gtkprefs.c:1189
+#: src/gtkprefs.c:1214
 msgid "Browser Selection"
 msgstr "Izbira brskalnika"
 
-#: src/gtkprefs.c:1193
+#: src/gtkprefs.c:1218
 msgid "_Browser:"
 msgstr "_Brskalnik:"
 
-#: src/gtkprefs.c:1201
+#: src/gtkprefs.c:1226
 msgid "_Open link in:"
 msgstr "_Odpri povezavo v:"
 
-#: src/gtkprefs.c:1203
+#: src/gtkprefs.c:1228
 msgid "Browser default"
 msgstr "Privzeto za brskalnik"
 
-#: src/gtkprefs.c:1204
+#: src/gtkprefs.c:1229
 msgid "Existing window"
 msgstr "Obstoje�e okno"
 
-#: src/gtkprefs.c:1206
+#: src/gtkprefs.c:1231
 msgid "New tab"
 msgstr "Nov zavihek"
 
-#: src/gtkprefs.c:1220
+#: src/gtkprefs.c:1245
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -4013,56 +4460,56 @@
 "_Ro�no:\n"
 "(%s namesto URL)"
 
-#: src/gtkprefs.c:1256 src/gtkprefs.c:1738
+#: src/gtkprefs.c:1281
+#: src/gtkprefs.c:1754
 msgid "Logging"
 msgstr "Bele転enje v dnevnik"
 
-#: src/gtkprefs.c:1259
-msgid "Log _Format:"
+#: src/gtkprefs.c:1284
+msgid "Log _format:"
 msgstr "Oblika _dnevnika:"
 
-#: src/gtkprefs.c:1264
-#, fuzzy
+#: src/gtkprefs.c:1289
 msgid "Log all _instant messages"
-msgstr "_Shranjuj vsa neposredna sporo�ila"
-
-#: src/gtkprefs.c:1266
+msgstr "Shranjuj vsa _neposredna sporo�ila"
+
+#: src/gtkprefs.c:1291
 msgid "Log all c_hats"
 msgstr "Shranjuj vse po_menke"
 
-#: src/gtkprefs.c:1268
+#: src/gtkprefs.c:1293
 msgid "Log all _status changes to system log"
-msgstr ""
-
-#: src/gtkprefs.c:1400
+msgstr "Bele転i vse spremembe _stanja v sistemski dnevnik"
+
+#: src/gtkprefs.c:1425
 msgid "Sound Selection"
 msgstr "Izbira zvoka"
 
-#: src/gtkprefs.c:1454
+#: src/gtkprefs.c:1479
 msgid "Sound Method"
 msgstr "Na�in zvoka"
 
-#: src/gtkprefs.c:1455
+#: src/gtkprefs.c:1480
 msgid "_Method:"
 msgstr "_Na�in:"
 
-#: src/gtkprefs.c:1457
+#: src/gtkprefs.c:1482
 msgid "Console beep"
 msgstr "Pisk"
 
-#: src/gtkprefs.c:1459
+#: src/gtkprefs.c:1484
 msgid "Automatic"
 msgstr "Samodejno"
 
-#: src/gtkprefs.c:1464
+#: src/gtkprefs.c:1489
 msgid "Command"
 msgstr "Ukaz"
 
-#: src/gtkprefs.c:1465
+#: src/gtkprefs.c:1490
 msgid "No sounds"
 msgstr "Nemo"
 
-#: src/gtkprefs.c:1473
+#: src/gtkprefs.c:1498
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4071,112 +4518,113 @@
 "Ukaz za _zvok:\n"
 "(%s namesto datoteke)"
 
-#: src/gtkprefs.c:1499
+#: src/gtkprefs.c:1524
 msgid "Sound Options"
 msgstr "Nastavitve zvoka"
 
-#: src/gtkprefs.c:1500
+#: src/gtkprefs.c:1525
 msgid "Sounds when conversation has _focus"
 msgstr "Zvok, ko pogovorno okno dobi _fokus"
 
-#: src/gtkprefs.c:1502
+#: src/gtkprefs.c:1527
 msgid "_Sounds while away"
 msgstr "_Zvoki, kadar sem odsoten"
 
-#: src/gtkprefs.c:1512
+#: src/gtkprefs.c:1537
 msgid "Sound Events"
 msgstr "Zvo�ni Dogodki"
 
-#: src/gtkprefs.c:1563
+#: src/gtkprefs.c:1588
 msgid "Play"
 msgstr "Predvajaj"
 
-#: src/gtkprefs.c:1570
+#: src/gtkprefs.c:1595
 msgid "Event"
 msgstr "Dogodek"
 
-#: src/gtkprefs.c:1589
+#: src/gtkprefs.c:1614
 msgid "Test"
 msgstr "Preskus"
 
-#: src/gtkprefs.c:1593
+#: src/gtkprefs.c:1618
 msgid "Reset"
 msgstr "Ponastavi"
 
-#: src/gtkprefs.c:1597
+#: src/gtkprefs.c:1622
 msgid "Choose..."
 msgstr "Izberi ..."
 
-#: src/gtkprefs.c:1651 src/gtkstatusbox.c:295
-#: src/protocols/bonjour/bonjour.c:240 src/protocols/irc/irc.c:176
-#: src/protocols/irc/msgs.c:221 src/protocols/jabber/buddy.c:1093
-#: src/protocols/jabber/jabber.c:1055 src/protocols/msn/msn.c:577
-#: src/protocols/novell/novell.c:2825 src/protocols/novell/novell.c:2959
-#: src/protocols/novell/novell.c:3041 src/protocols/oscar/oscar.c:707
-#: src/protocols/oscar/oscar.c:6516 src/protocols/oscar/oscar.c:6585
-#: src/protocols/oscar/oscar.c:7610 src/protocols/oscar/oscar.c:7764
-#: src/protocols/sametime/sametime.c:2764 src/protocols/silc/buddy.c:1417
-#: src/protocols/silc/silc.c:52 src/protocols/yahoo/yahoo.c:3225
-#: src/protocols/zephyr/zephyr.c:2259 src/status.c:158
+#: src/gtkprefs.c:1661
+#: src/gtkstatusbox.c:401
+#: src/protocols/bonjour/bonjour.c:252
+#: src/protocols/irc/irc.c:175
+#: src/protocols/irc/irc.c:457
+#: src/protocols/irc/msgs.c:221
+#: src/protocols/jabber/buddy.c:1093
+#: src/protocols/jabber/jabber.c:1055
+#: src/protocols/msn/msn.c:585
+#: src/protocols/novell/novell.c:2851
+#: src/protocols/novell/novell.c:2986
+#: src/protocols/oscar/oscar.c:709
+#: src/protocols/oscar/oscar.c:6615
+#: src/protocols/oscar/oscar.c:7644
+#: src/protocols/oscar/oscar.c:7798
+#: src/protocols/sametime/sametime.c:3291
+#: src/protocols/silc/buddy.c:1431
+#: src/protocols/silc/silc.c:53
+#: src/protocols/yahoo/yahoo.c:3108
+#: src/protocols/yahoo/yahoo.c:3207
+#: src/protocols/zephyr/zephyr.c:2259
+#: src/status.c:157
 msgid "Away"
 msgstr "Odsoten"
 
-#: src/gtkprefs.c:1652
-msgid "_Queue new messages when away"
-msgstr "_Zbiraj sporo�ila, kadar sem odsoten"
-
-#: src/gtkprefs.c:1655
+#: src/gtkprefs.c:1663
 msgid "_Auto-reply:"
 msgstr "_Samodejni odziv"
 
-#: src/gtkprefs.c:1658
-msgid "When away"
-msgstr "ob odsotnosti"
-
-#: src/gtkprefs.c:1659
+#: src/gtkprefs.c:1667
 msgid "When both away and idle"
 msgstr "ob odsotnosti in nedejavnosti"
 
-#: src/gtkprefs.c:1662
+#: src/gtkprefs.c:1670
 msgid "_Report idle time"
 msgstr "Prika転i _�as nedejavnosti"
 
-#: src/gtkprefs.c:1665
+#: src/gtkprefs.c:1673
 msgid "Auto-away"
 msgstr "Samodejna odsotnost"
 
-#: src/gtkprefs.c:1666
-#, fuzzy
+#: src/gtkprefs.c:1674
 msgid "Change status when _idle"
-msgstr "Nastavi _odsotnost ob nedejavnosti"
-
-#: src/gtkprefs.c:1670
-#, fuzzy
-msgid "_Minutes before changing status:"
-msgstr "�tevilo _minut nedejavnosti za nastavitev odsotnosti:"
+msgstr "Spremeni stanje ob _nedejavnosti"
 
 #: src/gtkprefs.c:1678
-#, fuzzy
+msgid "_Minutes before changing status:"
+msgstr "�tevilo _minut pred spremembo stanja:"
+
+#: src/gtkprefs.c:1686
 msgid "Change _status to:"
-msgstr "Spremeni naslov v:"
-
-#: src/gtkprefs.c:1728
+msgstr "Spremeni _stanje v:"
+
+#: src/gtkprefs.c:1744
 msgid "Smiley Themes"
 msgstr "Teme za sme邸ke"
 
-#: src/gtkprefs.c:1729
+#: src/gtkprefs.c:1745
 msgid "Sounds"
 msgstr "Zvoki"
 
-#: src/gtkprefs.c:1730 src/protocols/silc/silc.c:1589
+#: src/gtkprefs.c:1746
+#: src/protocols/silc/silc.c:1818
 msgid "Network"
 msgstr "Omre転je"
 
-#: src/gtkprefs.c:1735
+#: src/gtkprefs.c:1751
 msgid "Browser"
 msgstr "Brskalnik"
 
-#: src/gtkprefs.c:1739
+#: src/gtkprefs.c:1755
 msgid "Away / Idle"
 msgstr "Odsotnost / Nedejavnost"
 
@@ -4213,7 +4661,8 @@
 msgid "Set privacy for:"
 msgstr "Nastavi zasebnost za:"
 
-#: src/gtkprivacy.c:589 src/gtkprivacy.c:605
+#: src/gtkprivacy.c:589
+#: src/gtkprivacy.c:605
 msgid "Permit User"
 msgstr "Dovoli uporabniku"
 
@@ -4223,10 +4672,10 @@
 
 #: src/gtkprivacy.c:591
 msgid "Please enter the name of the user you wish to be able to contact you."
-msgstr ""
-"Prosim vnesite ime uporabnika, ki mu 転elite omogo�iti, da stopi v stik z vami"
-
-#: src/gtkprivacy.c:594 src/gtkprivacy.c:607
+msgstr "Prosim vnesite ime uporabnika, ki mu 転elite omogo�iti, da stopi v stik z vami"
+
+#: src/gtkprivacy.c:594
+#: src/gtkprivacy.c:607
 msgid "Permit"
 msgstr "Dovoli"
 
@@ -4240,7 +4689,8 @@
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Ste prepri�ani, da 転elite dovoliti %s, da stopi v stik z vami?"
 
-#: src/gtkprivacy.c:628 src/gtkprivacy.c:641
+#: src/gtkprivacy.c:628
+#: src/gtkprivacy.c:641
 msgid "Block User"
 msgstr "Zavrni uporabnika"
 
@@ -4252,7 +4702,9 @@
 msgid "Please enter the name of the user you wish to block."
 msgstr "Vnesite ime uporabnika, ki ga 転elite zavrniti."
 
-#: src/gtkprivacy.c:632 src/gtkprivacy.c:643 src/protocols/gg/gg.c:1135
+#: src/gtkprivacy.c:632
+#: src/gtkprivacy.c:643
+#: src/protocols/gg/gg.c:1457
 msgid "Block"
 msgstr "Zavrni"
 
@@ -4269,42 +4721,55 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:259 src/protocols/msn/dialog.c:113
-#: src/protocols/msn/msn.c:553 src/protocols/msn/msn.c:556
-#: src/protocols/novell/novell.c:1902 src/protocols/silc/buddy.c:312
-#: src/protocols/silc/pk.c:117 src/request.h:1322
+#: src/gtkrequest.c:285
+#: src/protocols/msn/dialog.c:113
+#: src/protocols/msn/msn.c:561
+#: src/protocols/msn/msn.c:564
+#: src/protocols/novell/novell.c:1923
+#: src/protocols/silc/buddy.c:313
+#: src/protocols/silc/pk.c:117
+#: src/protocols/silc/wb.c:303
+#: src/request.h:1322
 msgid "Yes"
 msgstr "Da"
 
-#: src/gtkrequest.c:260 src/protocols/msn/dialog.c:114
-#: src/protocols/msn/msn.c:553 src/protocols/msn/msn.c:556
-#: src/protocols/novell/novell.c:1903 src/protocols/silc/buddy.c:313
-#: src/protocols/silc/pk.c:118 src/request.h:1322
+#: src/gtkrequest.c:286
+#: src/protocols/msn/dialog.c:114
+#: src/protocols/msn/msn.c:561
+#: src/protocols/msn/msn.c:564
+#: src/protocols/novell/novell.c:1924
+#: src/protocols/silc/buddy.c:314
+#: src/protocols/silc/pk.c:118
+#: src/protocols/silc/wb.c:304
+#: src/request.h:1322
 msgid "No"
 msgstr "Ne"
 
-#: src/gtkrequest.c:263
+#: src/gtkrequest.c:289
 msgid "Apply"
 msgstr "Uporabi"
 
-#: src/gtkrequest.c:264 src/protocols/msn/msn.c:357
-#: src/protocols/silc/util.c:335
+#: src/gtkrequest.c:290
+#: src/protocols/msn/msn.c:357
+#: src/protocols/silc/util.c:336
 msgid "Close"
 msgstr "Zapri"
 
-#: src/gtkrequest.c:1796
+#: src/gtkrequest.c:1832
 msgid "That file already exists"
 msgstr "Datoteka 転e obstaja"
 
-#: src/gtkrequest.c:1797
+#: src/gtkrequest.c:1833
 msgid "Would you like to overwrite it?"
 msgstr "Ali jo 転elite prepisati?"
 
-#: src/gtkrequest.c:1839 src/gtkrequest.c:1880
+#: src/gtkrequest.c:1877
+#: src/gtkrequest.c:1918
 msgid "Save File..."
 msgstr "Shrani datoteko ..."
 
-#: src/gtkrequest.c:1840 src/gtkrequest.c:1881
+#: src/gtkrequest.c:1878
+#: src/gtkrequest.c:1919
 msgid "Open File..."
 msgstr "Odpri datoteko ..."
 
@@ -4317,74 +4782,103 @@
 msgid "_Get List"
 msgstr "_Dobi seznam"
 
-#: src/gtksavedstatuses.c:362 src/protocols/jabber/buddy.c:264
-#: src/protocols/jabber/buddy.c:805 src/protocols/novell/novell.c:1460
+#: src/gtksavedstatuses.c:437
+#: src/protocols/jabber/buddy.c:264
+#: src/protocols/jabber/buddy.c:805
+#: src/protocols/novell/novell.c:1488
 msgid "Title"
 msgstr "Naziv"
 
-#: src/gtksavedstatuses.c:377
+#: src/gtksavedstatuses.c:452
 msgid "Type"
 msgstr "Vrsta"
 
-#: src/gtksavedstatuses.c:388 src/protocols/bonjour/bonjour.c:234
-#: src/protocols/bonjour/bonjour.c:241 src/protocols/gg/gg.c:1083
-#: src/protocols/gg/gg.c:1088 src/protocols/gg/gg.c:1097
-#: src/protocols/gg/gg.c:1107 src/protocols/gg/gg.c:1112
-#: src/protocols/irc/irc.c:177 src/protocols/jabber/jabber.c:1032
-#: src/protocols/jabber/jabber.c:1040 src/protocols/jabber/jabber.c:1048
-#: src/protocols/jabber/jabber.c:1056 src/protocols/jabber/jabber.c:1064
-#: src/protocols/jabber/jabber.c:1072 src/protocols/novell/novell.c:2845
-#: src/protocols/oscar/oscar.c:7758 src/protocols/oscar/oscar.c:7765
-#: src/protocols/sametime/sametime.c:2759
-#: src/protocols/sametime/sametime.c:2765
-#: src/protocols/sametime/sametime.c:2771 src/protocols/simple/simple.c:255
-#: src/protocols/yahoo/yahoo.c:3220 src/protocols/yahoo/yahoo.c:3226
+#: src/gtksavedstatuses.c:463
+#: src/gtksavedstatuses.c:894
+#: src/protocols/bonjour/bonjour.c:246
+#: src/protocols/bonjour/bonjour.c:253
+#: src/protocols/gg/gg.c:1408
+#: src/protocols/gg/gg.c:1413
+#: src/protocols/gg/gg.c:1422
+#: src/protocols/gg/gg.c:1427
+#: src/protocols/gg/gg.c:1432
+#: src/protocols/irc/irc.c:176
+#: src/protocols/jabber/jabber.c:1032
+#: src/protocols/jabber/jabber.c:1040
+#: src/protocols/jabber/jabber.c:1048
+#: src/protocols/jabber/jabber.c:1056
+#: src/protocols/jabber/jabber.c:1064
+#: src/protocols/jabber/jabber.c:1072
+#: src/protocols/novell/novell.c:2871
+#: src/protocols/novell/novell.c:2982
+#: src/protocols/novell/novell.c:2988
+#: src/protocols/novell/novell.c:2994
+#: src/protocols/oscar/oscar.c:7792
+#: src/protocols/oscar/oscar.c:7799
+#: src/protocols/sametime/sametime.c:3286
+#: src/protocols/sametime/sametime.c:3292
+#: src/protocols/sametime/sametime.c:3298
+#: src/protocols/sametime/sametime.c:3371
+#: src/protocols/simple/simple.c:255
+#: src/protocols/yahoo/yahoo.c:3202
+#: src/protocols/yahoo/yahoo.c:3208
 #: src/protocols/zephyr/zephyr.c:2260
 msgid "Message"
 msgstr "Sporo�ilo"
 
-#: src/gtksavedstatuses.c:451
+#: src/gtksavedstatuses.c:526
 msgid "Saved Statuses"
 msgstr "Shranjena stanja"
 
 #. Use button
-#. TODO: It might be better if the button said "Use" or "Activate"
-#: src/gtksavedstatuses.c:477
-#, fuzzy
+#: src/gtksavedstatuses.c:551
 msgid "_Use"
-msgstr "_Odnastavi"
-
-#: src/gtksavedstatuses.c:584
+msgstr "_Uporabi"
+
+#: src/gtksavedstatuses.c:660
 msgid "Title already in use.  You must choose a unique title."
 msgstr "Naziv je 転e v uporabi. Prosimo, izberite drug naziv."
 
-#: src/gtksavedstatuses.c:675
-msgid "Custom status"
-msgstr "Stanja po meri"
-
-#: src/gtksavedstatuses.c:778 src/protocols/gg/gg.c:1064
-#: src/protocols/gg/gg.c:1069 src/protocols/jabber/buddy.c:626
-#: src/protocols/jabber/buddy.c:633 src/protocols/jabber/buddy.c:644
-#: src/protocols/jabber/jabber.c:1005 src/protocols/msn/msn.c:544
-#: src/protocols/novell/novell.c:2844 src/protocols/novell/novell.c:2848
-#: src/protocols/oscar/oscar.c:762 src/protocols/oscar/oscar.c:767
-#: src/protocols/oscar/oscar.c:769 src/protocols/yahoo/yahoo.c:2787
+#: src/gtksavedstatuses.c:853
+msgid "Different"
+msgstr "Razno"
+
+#: src/gtksavedstatuses.c:883
+#: src/gtksavedstatuses.c:1010
+#: src/protocols/gg/gg.c:1389
+#: src/protocols/gg/gg.c:1394
+#: src/protocols/jabber/buddy.c:626
+#: src/protocols/jabber/buddy.c:633
+#: src/protocols/jabber/buddy.c:644
+#: src/protocols/jabber/jabber.c:1005
+#: src/protocols/msn/msn.c:552
+#: src/protocols/novell/novell.c:2870
+#: src/protocols/novell/novell.c:2874
+#: src/protocols/oscar/oscar.c:764
+#: src/protocols/oscar/oscar.c:769
+#: src/protocols/oscar/oscar.c:771
+#: src/protocols/yahoo/yahoo.c:2804
 msgid "Status"
 msgstr "Stanje"
 
-#: src/gtksavedstatuses.c:797
+#: src/gtksavedstatuses.c:1029
 msgid "_Title:"
 msgstr "_Naziv:"
 
-#: src/gtksavedstatuses.c:817
+#: src/gtksavedstatuses.c:1049
+#: src/gtksavedstatuses.c:1330
 msgid "_Status:"
 msgstr "_Stanje:"
 
-#. Custom status message expander
-#: src/gtksavedstatuses.c:852
-#, fuzzy
+#. Different status message expander
+#: src/gtksavedstatuses.c:1084
 msgid "Use a _different status for some accounts"
-msgstr "Za nekatere ra�une uporabi razli�no stanje"
+msgstr "Za nekatere ra�une uporabi _razli�no stanje"
+
+#: src/gtksavedstatuses.c:1309
+#, c-format
+msgid "Status for %s"
+msgstr "Stanje za %s"
 
 #: src/gtksound.c:61
 msgid "Buddy logs in"
@@ -4432,181 +4926,189 @@
 msgstr "Zvoka ni bilo mo� predvajati, ker izbrana datoteka (%s) ne obstaja."
 
 #: src/gtksound.c:430
-msgid ""
-"Unable to play sound because the 'Command' sound method has been chosen, but "
-"no command has been set."
-msgstr ""
-"Ni bilo mogo�e predvajati zvoka, ker ste izbrali ukaz za predvajanje zvoka, "
-"niste pa nastavili ukaza."
+msgid "Unable to play sound because the 'Command' sound method has been chosen, but no command has been set."
+msgstr "Ni bilo mogo�e predvajati zvoka, ker ste izbrali ukaz za predvajanje zvoka, niste pa nastavili ukaza."
 
 #: src/gtksound.c:442
 #, c-format
-msgid ""
-"Unable to play sound because the configured sound command could not be "
-"launched: %s"
-msgstr ""
-"Zvoka ni bilo mogo�e predvajati, ker izbranega ukaza za zvok ni bilo mogo�e "
-"pognati: %s"
-
-#: src/gtkstatusbox.c:197
+msgid "Unable to play sound because the configured sound command could not be launched: %s"
+msgstr "Zvoka ni bilo mogo�e predvajati, ker izbranega ukaza za zvok ni bilo mogo�e pognati: %s"
+
+#: src/gtkstatusbox.c:255
 msgid "Typing"
 msgstr "Tipka"
 
 #. connect to the server
-#: src/gtkstatusbox.c:200 src/protocols/irc/irc.c:258
-#: src/protocols/jabber/jabber.c:838 src/protocols/msn/session.c:362
-#: src/protocols/napster/napster.c:525 src/protocols/novell/novell.c:2164
-#: src/protocols/oscar/oscar.c:1816 src/protocols/simple/simple.c:1276
-#: src/protocols/yahoo/yahoo.c:2455 src/protocols/zephyr/zephyr.c:1546
+#: src/gtkstatusbox.c:258
+#: src/protocols/irc/irc.c:257
+#: src/protocols/jabber/jabber.c:838
+#: src/protocols/msn/session.c:349
+#: src/protocols/napster/napster.c:531
+#: src/protocols/novell/novell.c:2185
+#: src/protocols/oscar/oscar.c:1818
+#: src/protocols/sametime/sametime.c:3647
+#: src/protocols/simple/simple.c:1285
+#: src/protocols/yahoo/yahoo.c:2505
+#: src/protocols/zephyr/zephyr.c:1546
 msgid "Connecting"
 msgstr "Povezovanje"
 
 #. hacks
-#: src/gtkstatusbox.c:294 src/protocols/bonjour/bonjour.c:233
-#: src/protocols/irc/irc.c:172 src/protocols/jabber/jabber.c:1039
-#: src/protocols/msn/msn.c:573 src/protocols/msn/state.c:29
-#: src/protocols/msn/state.c:30 src/protocols/msn/state.c:37
-#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2822
-#: src/protocols/novell/novell.c:2956 src/protocols/novell/novell.c:3039
-#: src/protocols/oscar/oscar.c:808 src/protocols/oscar/oscar.c:7757
-#: src/protocols/simple/simple.c:253 src/protocols/silc/silc.c:48
-#: src/protocols/yahoo/yahoo.c:3214 src/status.c:155
+#: src/gtkstatusbox.c:400
+#: src/protocols/bonjour/bonjour.c:245
+#: src/protocols/irc/irc.c:171
+#: src/protocols/jabber/jabber.c:1039
+#: src/protocols/msn/msn.c:581
+#: src/protocols/msn/state.c:29
+#: src/protocols/msn/state.c:30
+#: src/protocols/msn/state.c:37
+#: src/protocols/msn/state.c:38
+#: src/protocols/novell/novell.c:2848
+#: src/protocols/novell/novell.c:2980
+#: src/protocols/oscar/oscar.c:810
+#: src/protocols/oscar/oscar.c:7791
+#: src/protocols/silc/silc.c:49
+#: src/protocols/simple/simple.c:253
+#: src/status.c:154
 msgid "Available"
 msgstr "Na voljo"
 
-#.
-#. * Without this selecting Invisible as own status doesn't
-#. * work. It's not used and not needed to show status of buddies.
-#.
-#: src/gtkstatusbox.c:296 src/protocols/gg/gg.c:1096
-#: src/protocols/oscar/oscar.c:711 src/protocols/oscar/oscar.c:7771
-#: src/protocols/yahoo/yahoo.c:2633 src/protocols/yahoo/yahoo.c:3257
+#: src/gtkstatusbox.c:402
+#: src/protocols/gg/gg.c:1422
+#: src/protocols/oscar/oscar.c:713
+#: src/protocols/oscar/oscar.c:7805
+#: src/protocols/yahoo/yahoo.c:2653
+#: src/protocols/yahoo/yahoo.c:3240
 msgid "Invisible"
 msgstr "Neviden"
 
-#: src/gtkstatusbox.c:297 src/protocols/bonjour/bonjour.c:228
-#: src/protocols/gg/gg.c:1082 src/protocols/irc/irc.c:168
-#: src/protocols/jabber/buddy.c:1087 src/protocols/jabber/jabber.c:1032
-#: src/protocols/msn/msn.c:569 src/protocols/napster/napster.c:573
-#: src/protocols/novell/novell.c:2834 src/protocols/novell/novell.c:2953
-#: src/protocols/oscar/oscar.c:769 src/protocols/oscar/oscar.c:7591
-#: src/protocols/oscar/oscar.c:7752 src/protocols/sametime/sametime.c:2754
-#: src/protocols/simple/simple.c:249 src/protocols/silc/silc.c:46
-#: src/protocols/yahoo/yahoo.c:2637 src/protocols/yahoo/yahoo.c:3211
-#: src/status.c:154
+#: src/gtkstatusbox.c:403
+#: src/protocols/bonjour/bonjour.c:240
+#: src/protocols/gg/gg.c:1408
+#: src/protocols/irc/irc.c:167
+#: src/protocols/jabber/buddy.c:1087
+#: src/protocols/jabber/jabber.c:1032
+#: src/protocols/msn/msn.c:577
+#: src/protocols/napster/napster.c:579
+#: src/protocols/novell/novell.c:2860
+#: src/protocols/novell/novell.c:2977
+#: src/protocols/oscar/oscar.c:771
+#: src/protocols/oscar/oscar.c:7625
+#: src/protocols/oscar/oscar.c:7786
+#: src/protocols/sametime/sametime.c:3281
+#: src/protocols/silc/silc.c:47
+#: src/protocols/simple/simple.c:249
+#: src/protocols/yahoo/yahoo.c:2657
+#: src/protocols/yahoo/yahoo.c:3197
+#: src/status.c:153
 msgid "Offline"
 msgstr "Brez povezave"
 
-#: src/gtkstatusbox.c:299
+#: src/gtkstatusbox.c:405
 msgid "Custom..."
-msgstr ""
-
-#: src/gtkstatusbox.c:300
-#, fuzzy
+msgstr "Po meri ..."
+
+#: src/gtkstatusbox.c:406
 msgid "Saved..."
-msgstr "Shrani datoteko ..."
-
-#: src/gtkstock.c:117
+msgstr "Datoteka shranjena ..."
+
+#: src/gtkstock.c:138
 msgid "_Alias"
 msgstr "_Psevdonim"
 
-#: src/gtkstock.c:119
+#: src/gtkstock.c:140
 msgid "_Invite"
 msgstr "Povab_i"
 
-#: src/gtkstock.c:120
+#: src/gtkstock.c:141
 msgid "_Modify"
 msgstr "_Spremeni"
 
-#: src/gtkstock.c:121
+#: src/gtkstock.c:142
 msgid "_Open Mail"
 msgstr "_Odpri po邸to"
 
-#: src/gtkstock.c:123
+#: src/gtkstock.c:144
 msgid "_Warn"
 msgstr "_Opozori"
 
-#: src/gtkutils.c:1393 src/gtkutils.c:1418
+#: src/gtkutils.c:1309
+#: src/gtkutils.c:1334
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "Pri odpiranju %s je pri邸lo do neznane napake: %s"
 
-#: src/gtkutils.c:1395 src/gtkutils.c:1420
+#: src/gtkutils.c:1311
+#: src/gtkutils.c:1336
 msgid "Failed to load image"
 msgstr "Slike ni mogo�e odpreti"
 
-#: src/gtkutils.c:1495
+#: src/gtkutils.c:1411
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Ni mogo�e poslati imenika %s."
 
-#: src/gtkutils.c:1497
-msgid ""
-"Gaim cannot transfer a folder. You will need to send the files within "
-"individually"
-msgstr ""
-"Gaim ne more prenesti imenika. Datoteke boste morali poslati posami�no."
-
-#: src/gtkutils.c:1525 src/gtkutils.c:1534 src/gtkutils.c:1539
+#: src/gtkutils.c:1413
+msgid "Gaim cannot transfer a folder. You will need to send the files within individually"
+msgstr "Gaim ne more prenesti imenika. Datoteke boste morali poslati posami�no."
+
+#: src/gtkutils.c:1441
+#: src/gtkutils.c:1450
+#: src/gtkutils.c:1455
 msgid "You have dragged an image"
 msgstr "Povlekli ste sliko"
 
-#: src/gtkutils.c:1526
-msgid ""
-"You can send this image as a file transfer, embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr ""
-"To sliko lahko po邸ljete kot datoteko, jo vklju�ite v to sporo�ilo ali "
-"uporabite kot ikono za tega uporabnika."
-
-#: src/gtkutils.c:1530 src/gtkutils.c:1545
+#: src/gtkutils.c:1442
+msgid "You can send this image as a file transfer, embed it into this message, or use it as the buddy icon for this user."
+msgstr "To sliko lahko po邸ljete kot datoteko, jo vklju�ite v to sporo�ilo ali uporabite kot ikono za tega uporabnika."
+
+#: src/gtkutils.c:1446
+#: src/gtkutils.c:1461
 msgid "Set as buddy icon"
 msgstr "Nastavi kot ikono prijatelja"
 
-#: src/gtkutils.c:1531 src/gtkutils.c:1546
+#: src/gtkutils.c:1447
+#: src/gtkutils.c:1462
 msgid "Send image file"
 msgstr "Po邸lji slikovno datoteko"
 
-#: src/gtkutils.c:1532 src/gtkutils.c:1546
+#: src/gtkutils.c:1448
+#: src/gtkutils.c:1462
 msgid "Insert in message"
 msgstr "Vstavi v sporo�ilo"
 
-#: src/gtkutils.c:1535
+#: src/gtkutils.c:1451
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Jo 転elite nastaviti za ikono prijatelja?"
 
-#: src/gtkutils.c:1540
-msgid ""
-"You can send this image as a file transfer or embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr ""
-"To sliko lahko po邸ljete kot datoteko, jo vklju�ite v to sporo�ilo ali jo "
-"uporabite kot ikono za tega uporabnika."
-
-#: src/gtkutils.c:1542
-msgid ""
-"You can insert this image into this message, or use it as the buddy icon for "
-"this user"
-msgstr ""
-"To sliko lahko vstavite v to sporo�ilo ali pa jo uporabite kot ikono "
-"prijatelja za tega prijatelja"
+#: src/gtkutils.c:1456
+msgid "You can send this image as a file transfer or embed it into this message, or use it as the buddy icon for this user."
+msgstr "To sliko lahko po邸ljete kot datoteko, jo vklju�ite v to sporo�ilo ali jo uporabite kot ikono za tega uporabnika."
+
+#: src/gtkutils.c:1458
+msgid "You can insert this image into this message, or use it as the buddy icon for this user"
+msgstr "To sliko lahko vstavite v to sporo�ilo ali pa jo uporabite kot ikono prijatelja za tega prijatelja"
 
 #. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
 #. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: src/gtkutils.c:1596
+#: src/gtkutils.c:1512
 msgid "Cannot send launcher"
 msgstr "Ni mogo�e poslati zaganjalnika"
 
-#: src/gtkutils.c:1596
-msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
-msgstr ""
-"Povlekli ste namizni zaganjalnik. Najverjetneje ste 転eleli namesto samega "
-"zaganjalnika poslati tisto, na kar ta zaganjalnik ka転e."
+#: src/gtkutils.c:1512
+msgid "You dragged a desktop launcher. Most likely you wanted to send whatever this launcher points to instead of this launcher itself."
+msgstr "Povlekli ste namizni zaganjalnik. Najverjetneje ste 転eleli namesto samega zaganjalnika poslati tisto, na kar ta zaganjalnik ka転e."
+
+#. Write a local message to this conversation showing that a request for a
+#. * Doodle session has been made
+#.
+#: src/gtkwhiteboard.c:344
+#: src/protocols/yahoo/yahoo_doodle.c:96
+msgid "Sent Doodle request."
+msgstr "Po邸lji zahtevo Doodle."
 
 #: src/log.c:129
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
@@ -4622,27 +5124,21 @@
 
 #: src/log.c:904
 #, c-format
-msgid ""
-"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
-"REPLY&gt;:</b></font> %s<br/>\n"
-msgstr ""
-"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;SAMODEJNI "
-"ODGOVOR&gt;:</b></font> %s<br/>\n"
+msgid "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
+msgstr "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;SAMODEJNI ODGOVOR&gt;:</b></font> %s<br/>\n"
 
 #: src/log.c:906
 #, c-format
-msgid ""
-"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
-"REPLY&gt;:</b></font> %s<br/>\n"
-msgstr ""
-"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;SAMODEJNI "
-"ODGOVOR&gt;:</b></font> %s<br/>\n"
-
-#: src/log.c:957 src/log.c:1074
+msgid "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
+msgstr "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;SAMODEJNI ODGOVOR&gt;:</b></font> %s<br/>\n"
+
+#: src/log.c:957
+#: src/log.c:1074
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>Ni mogo�e najti poti do dnevnika!</b></font>"
 
-#: src/log.c:967 src/log.c:1086
+#: src/log.c:967
+#: src/log.c:1086
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Ni mogo�e brati datoteke: %s</b></font>"
@@ -4652,48 +5148,57 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
-#: src/plugin.c:331
-#, c-format
-msgid ""
-"The required plugin %s was not found. Please install this plugin and try "
-"again."
-msgstr ""
-"Zahtevani dodatek %s ni bil najden. Prosim namestite dodatek in poskusite "
-"ponovno."
-
-#: src/plugin.c:336 src/plugin.c:364
+#: src/plugin.c:344
+#, c-format
+msgid "The required plugin %s was not found. Please install this plugin and try again."
+msgstr "Zahtevani dodatek %s ni bil najden. Prosim namestite dodatek in poskusite ponovno."
+
+#: src/plugin.c:349
+#: src/plugin.c:377
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim ni mogel nalo転iti va邸ega dodatka."
 
-#: src/plugin.c:360
+#: src/plugin.c:373
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "Zahtevanega dodatka %s se ni dalo nalo転iti."
 
-#: src/protocols/bonjour/bonjour.c:298 src/protocols/msn/msn.c:546
-#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2831
-#: src/protocols/oscar/oscar.c:5064 src/protocols/yahoo/yahoo.c:2635
+#. Send a message about the connection error
+#: src/protocols/bonjour/bonjour.c:101
+msgid "Unable to listen for incoming IM connections\n"
+msgstr "Dohodnim povezavam IM ni mogo�e prisluhniti\n"
+
+#: src/protocols/bonjour/bonjour.c:136
+msgid "Unable to establish connection with the local mDNS server.  Is it running?"
+msgstr "Povezave s krajevnim stre転nikom mDNS ni mogo�e vzpostaviti. Ali je stre転nik sploh zagnan?"
+
+#: src/protocols/bonjour/bonjour.c:317
+#: src/protocols/msn/msn.c:554
+#: src/protocols/msn/state.c:32
+#: src/protocols/novell/novell.c:2857
+#: src/protocols/oscar/oscar.c:5066
+#: src/protocols/yahoo/yahoo.c:2655
 #: src/protocols/yahoo/yahoo_profile.c:660
 msgid "Idle"
 msgstr "Nedejaven"
 
-#: src/protocols/bonjour/bonjour.c:303
-#, fuzzy, c-format
+#: src/protocols/bonjour/bonjour.c:322
+#, c-format
 msgid ""
 "\n"
 "<b>Status:</b> %s"
 msgstr ""
 "\n"
-"<b>Stanje</b>: Neverjetno!"
-
-#: src/protocols/bonjour/bonjour.c:305
-#, fuzzy, c-format
+"<b>Stanje</b>: %s"
+
+#: src/protocols/bonjour/bonjour.c:324
+#, c-format
 msgid ""
 "\n"
 "<b>Message:</b> %s"
 msgstr ""
 "\n"
-"<b>%s:</b> %s"
+"<b>Sporo�ilo:</b> %s"
 
 #. *< type
 #. *< ui_requirement
@@ -4705,205 +5210,328 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/bonjour/bonjour.c:388 src/protocols/bonjour/bonjour.c:390
-#, fuzzy
+#: src/protocols/bonjour/bonjour.c:418
+#: src/protocols/bonjour/bonjour.c:420
 msgid "Bonjour Protocol Plugin"
-msgstr "Dodatek za protokol Yahoo"
+msgstr "Dodatek za protokol Bonjour"
+
+#: src/protocols/bonjour/bonjour.c:452
+#: src/protocols/bonjour/bonjour.c:509
+msgid "Gaim User"
+msgstr "Uporabnik Gaim"
 
 #. Creating the user splits
-#: src/protocols/bonjour/bonjour.c:417
-#, fuzzy
+#: src/protocols/bonjour/bonjour.c:547
 msgid "Host name"
-msgstr "Priimek"
+msgstr "Ime gostitelja"
 
 #. Creating the options for the protocol
-#: src/protocols/bonjour/bonjour.c:421 src/protocols/irc/irc.c:822
-#: src/protocols/msn/msn.c:1968 src/protocols/napster/napster.c:712
-#: src/protocols/silc/silc.c:1597
+#. port to connect to
+#: src/protocols/bonjour/bonjour.c:551
+#: src/protocols/irc/irc.c:820
+#: src/protocols/msn/msn.c:1961
+#: src/protocols/napster/napster.c:719
+#: src/protocols/sametime/sametime.c:5668
+#: src/protocols/silc/silc.c:1826
 msgid "Port"
 msgstr "Vrata"
 
-#: src/protocols/bonjour/bonjour.c:424 src/protocols/gg/gg.c:405
+#: src/protocols/bonjour/bonjour.c:554
+#: src/protocols/gg/gg.c:571
+#: src/protocols/gg/gg.c:977
 msgid "First name"
 msgstr "Ime"
 
-#: src/protocols/bonjour/bonjour.c:427 src/protocols/gg/gg.c:401
+#: src/protocols/bonjour/bonjour.c:557
+#: src/protocols/gg/gg.c:566
 msgid "Last name"
 msgstr "Priimek"
 
-#: src/protocols/bonjour/bonjour.c:430 src/protocols/jabber/buddy.c:261
-#: src/protocols/jabber/buddy.c:772 src/protocols/jabber/buddy.c:780
-#: src/protocols/silc/silc.c:661 src/protocols/silc/util.c:511
+#: src/protocols/bonjour/bonjour.c:560
+#: src/protocols/jabber/buddy.c:261
+#: src/protocols/jabber/buddy.c:772
+#: src/protocols/jabber/buddy.c:780
+#: src/protocols/silc/silc.c:685
+#: src/protocols/silc/silc.c:925
+#: src/protocols/silc/util.c:512
 #: src/protocols/yahoo/yahoo_profile.c:995
 msgid "Email"
 msgstr "Elektronska po邸ta"
 
 #: src/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
-msgstr ""
-
-#: src/protocols/gg/gg.c:136 src/protocols/gg/gg.c:155
+msgstr "Bonjour"
+
+#: src/protocols/gg/gg.c:89
+#: src/protocols/gg/gg.c:111
+#: src/protocols/gg/gg.c:146
+msgid "Token Error"
+msgstr "Napaka 転etona"
+
+#: src/protocols/gg/gg.c:90
+#: src/protocols/gg/gg.c:112
+#: src/protocols/gg/gg.c:147
+msgid "Unable to fetch the token.\n"
+msgstr "Ni mogo�e prenesti 転etona.\n"
+
+#: src/protocols/gg/gg.c:235
+#: src/protocols/gg/gg.c:254
 msgid "Save Buddylist..."
 msgstr "Shrani seznam prijateljev ..."
 
-#: src/protocols/gg/gg.c:137
+#: src/protocols/gg/gg.c:236
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "Seznam prijateljev je prazen, v datoteko ni bilo ni� zapisanega."
 
-#: src/protocols/gg/gg.c:143 src/protocols/gg/gg.c:145
-#: src/protocols/gg/gg.c:176
+#: src/protocols/gg/gg.c:242
+#: src/protocols/gg/gg.c:244
 msgid "Couldn't open file"
 msgstr "Ni mogo�e odpreti datoteke"
 
-#: src/protocols/gg/gg.c:156
+#: src/protocols/gg/gg.c:255
 msgid "Buddylist saved successfully!"
 msgstr "Seznam prijateljev je bil uspe邸no shranjen!"
 
-#: src/protocols/gg/gg.c:178
-msgid "Could't open file"
-msgstr "Ni mogo�e odpreti datoteke"
-
-#: src/protocols/gg/gg.c:199
+#: src/protocols/gg/gg.c:273
+#: src/protocols/gg/gg.c:274
+msgid "Couldn't load buddylist"
+msgstr "Seznama prijateljev ni mogo�e nalo転iti"
+
+#: src/protocols/gg/gg.c:290
 msgid "Load Buddylist..."
 msgstr "Nalaganje seznama prijateljev ..."
 
-#: src/protocols/gg/gg.c:200
+#: src/protocols/gg/gg.c:291
 msgid "Buddylist loaded successfully!"
 msgstr "Seznam prijateljev je bil uspe邸no nalo転en"
 
-#: src/protocols/gg/gg.c:211
+#: src/protocols/gg/gg.c:302
 msgid "Save buddylist..."
 msgstr "Shrani seznam prijateljev ..."
 
-#: src/protocols/gg/gg.c:254
+#: src/protocols/gg/gg.c:346
 msgid "Fill in the registration fields."
 msgstr "Izpolnite polja za registracijo."
 
-#: src/protocols/gg/gg.c:259
+#: src/protocols/gg/gg.c:351
 msgid "Passwords do not match."
 msgstr "Gesli se ne ujemata."
 
-#: src/protocols/gg/gg.c:266
+#: src/protocols/gg/gg.c:360
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "Novega ra�una ni bilo mogo�e registrirati. Pri邸lo je do napake.\n"
 
-#: src/protocols/gg/gg.c:279
+#: src/protocols/gg/gg.c:373
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Nov ra�un Gadu-Gadu je registriran"
 
-#: src/protocols/gg/gg.c:280
+#: src/protocols/gg/gg.c:374
 msgid "Registration completed successfully!"
 msgstr "Registracija je uspela!"
 
-#: src/protocols/gg/gg.c:409 src/protocols/gg/gg.c:1665
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:698
-#: src/protocols/jabber/buddy.c:1341 src/protocols/jabber/jabber.c:648
-#: src/protocols/msn/msn.c:1394 src/protocols/silc/buddy.c:1480
-#: src/protocols/silc/ops.c:822 src/protocols/silc/ops.c:965
-#: src/protocols/silc/ops.c:1114 src/protocols/yahoo/yahoo_profile.c:1000
+#: src/protocols/gg/gg.c:434
+msgid "e-Mail"
+msgstr "E-po邸ta"
+
+#: src/protocols/gg/gg.c:439
+#: src/protocols/gg/gg.c:714
+#: src/protocols/jabber/jabber.c:632
+#: src/protocols/jabber/jabber.c:1150
+msgid "Password"
+msgstr "Geslo"
+
+#: src/protocols/gg/gg.c:444
+#: src/protocols/gg/gg.c:719
+msgid "Password (retype)"
+msgstr "Geslo (ponovno vtipkajte)"
+
+#: src/protocols/gg/gg.c:449
+#: src/protocols/gg/gg.c:724
+msgid "Enter current token"
+msgstr "Vnesite trenutni 転eton"
+
+#: src/protocols/gg/gg.c:455
+#: src/protocols/gg/gg.c:730
+msgid "Current token"
+msgstr "Trenutni 転eton"
+
+#: src/protocols/gg/gg.c:459
+#: src/protocols/gg/gg.c:460
+msgid "Register New Gadu-Gadu Account"
+msgstr "Registrirajte nov ra�un za Gadu-Gadu"
+
+#: src/protocols/gg/gg.c:461
+msgid "Please, fill in the following fields"
+msgstr "Prosimo, izpolnite naslednja polja"
+
+#: src/protocols/gg/gg.c:556
+#: src/protocols/gg/gg.c:1581
+msgid "Unable to initiate a new search"
+msgstr "Novega iskanja ni mogo�e za�eti"
+
+#: src/protocols/gg/gg.c:557
+#: src/protocols/gg/gg.c:1582
+msgid "You have a pending search. Please wait for it to finish."
+msgstr "Imate iskanje na �akanju. Prosimo, da po�akate na njegovo izvr邸itev."
+
+#: src/protocols/gg/gg.c:576
+#: src/protocols/gg/gg.c:1961
+#: src/protocols/jabber/buddy.c:252
+#: src/protocols/jabber/buddy.c:698
+#: src/protocols/jabber/buddy.c:1341
+#: src/protocols/jabber/jabber.c:648
+#: src/protocols/msn/msn.c:1386
+#: src/protocols/silc/buddy.c:1494
+#: src/protocols/silc/ops.c:1036
+#: src/protocols/silc/ops.c:1179
+#: src/protocols/silc/ops.c:1328
+#: src/protocols/yahoo/yahoo_profile.c:1000
 msgid "Nickname"
 msgstr "Vzdevek"
 
-#: src/protocols/gg/gg.c:413 src/protocols/jabber/jabber.c:668
-#: src/protocols/oscar/oscar.c:6006 src/protocols/oscar/oscar.c:6014
+#: src/protocols/gg/gg.c:581
+#: src/protocols/gg/gg.c:983
+#: src/protocols/jabber/jabber.c:668
+#: src/protocols/oscar/oscar.c:6055
+#: src/protocols/oscar/oscar.c:6063
 msgid "City"
 msgstr "Kraj"
 
-#: src/protocols/gg/gg.c:417
+#: src/protocols/gg/gg.c:586
 msgid "Year of birth"
 msgstr "Leto rojstva"
 
-#: src/protocols/gg/gg.c:426
+#: src/protocols/gg/gg.c:589
+#: src/protocols/msn/msn.c:1545
+#: src/protocols/oscar/oscar.c:6028
+#: src/protocols/yahoo/yahoo_profile.c:1025
+msgid "Gender"
+msgstr "Spol"
+
+#: src/protocols/gg/gg.c:590
+msgid "Male or female"
+msgstr "Mo邸ki ali 転enska"
+
+#: src/protocols/gg/gg.c:591
+#: src/protocols/oscar/oscar.c:6028
+msgid "Male"
+msgstr "Mo邸ki"
+
+#: src/protocols/gg/gg.c:592
+#: src/protocols/oscar/oscar.c:6028
+msgid "Female"
+msgstr "貼enska"
+
+#: src/protocols/gg/gg.c:596
 msgid "Only online"
 msgstr "Le prisoten"
 
-#: src/protocols/gg/gg.c:430 src/protocols/gg/gg.c:431
-#: src/protocols/gg/gg.c:1510
+#: src/protocols/gg/gg.c:600
+#: src/protocols/gg/gg.c:601
 msgid "Find buddies"
 msgstr "Poi邸�i prijatelje"
 
-#: src/protocols/gg/gg.c:432
+#: src/protocols/gg/gg.c:602
 msgid "Please, enter your search criteria below"
 msgstr "Spodaj vnesite svoje iskalne pogoje"
 
-#: src/protocols/gg/gg.c:465
+#: src/protocols/gg/gg.c:639
 msgid "Fill in the fields."
 msgstr "Izpolnite polja."
 
-#: src/protocols/gg/gg.c:476
+#: src/protocols/gg/gg.c:651
 msgid "Your current password is different from the one that you specified."
 msgstr "Va邸e veljavno geslo se razlikuje od navedenega."
 
-#: src/protocols/gg/gg.c:491
+#: src/protocols/gg/gg.c:666
 msgid "Unable to change password. Error occured.\n"
 msgstr "Gesla ni bilo mogo�e spremeniti. Pri邸lo je do napake.\n"
 
-#: src/protocols/gg/gg.c:500
+#: src/protocols/gg/gg.c:675
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Spremeni geslo za ra�un Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:501
+#: src/protocols/gg/gg.c:676
 msgid "Password was changed successfully!"
 msgstr "Geslo je bilo uspe邸no spremenjeno!"
 
-#: src/protocols/gg/gg.c:535
-msgid "Token Error"
-msgstr "Napaka 転etona"
-
-#: src/protocols/gg/gg.c:536
-msgid "Unable to fetch the token.\n"
-msgstr "Ni mogo�e prenesti 転etona.\n"
-
-#: src/protocols/gg/gg.c:551
+#: src/protocols/gg/gg.c:709
 msgid "Current password"
 msgstr "Trenutno geslo"
 
-#: src/protocols/gg/gg.c:555 src/protocols/gg/gg.c:1476
-#: src/protocols/jabber/jabber.c:632 src/protocols/jabber/jabber.c:1150
-msgid "Password"
-msgstr "Geslo"
-
-#: src/protocols/gg/gg.c:559 src/protocols/gg/gg.c:1480
-msgid "Password (retype)"
-msgstr "Geslo (ponovno vtipkajte)"
-
-#: src/protocols/gg/gg.c:563 src/protocols/gg/gg.c:1484
-msgid "Enter current token"
-msgstr "Vnesite trenutni 転eton"
-
-#. original size: 60x24
-#: src/protocols/gg/gg.c:568 src/protocols/gg/gg.c:1489
-msgid "Current token"
-msgstr "Trenutni 転eton"
-
-#: src/protocols/gg/gg.c:574
+#: src/protocols/gg/gg.c:734
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Vnesite svoje obstoje�e in novo geslo za UIN:"
 
-#: src/protocols/gg/gg.c:578 src/protocols/gg/gg.c:579
+#: src/protocols/gg/gg.c:738
+#: src/protocols/gg/gg.c:739
 msgid "Change Gadu-Gadu Password"
 msgstr "Spremeni geslo Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:649
+#: src/protocols/gg/gg.c:823
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Izberite klepet za prijatelja: %s"
 
-#: src/protocols/gg/gg.c:651 src/protocols/gg/gg.c:652
+#: src/protocols/gg/gg.c:826
+#: src/protocols/gg/gg.c:827
 msgid "Add to chat..."
 msgstr "Dodaj k pomenku ..."
 
-#: src/protocols/gg/gg.c:812
+#: src/protocols/gg/gg.c:966
+msgid "No matching users found"
+msgstr "Ni najdenih uporabnikov"
+
+#: src/protocols/gg/gg.c:967
+msgid "There are no users matching your search criteria."
+msgstr "Noben uporabnik ne ustreza iskalnim pogojem."
+
+#: src/protocols/gg/gg.c:974
+#: src/protocols/oscar/oscar.c:6000
+msgid "UIN"
+msgstr "UIN"
+
+#: src/protocols/gg/gg.c:980
+msgid "Nick name"
+msgstr "Vzdevek"
+
+#: src/protocols/gg/gg.c:986
+msgid "Birth year"
+msgstr "Leto rojstva"
+
+#: src/protocols/gg/gg.c:1026
+msgid "Gadu-Gadu Public Directory"
+msgstr "Javni imenik Gadu-Gadu"
+
+#: src/protocols/gg/gg.c:1027
+msgid "Search results"
+msgstr "Rezultati iskanja"
+
+#: src/protocols/gg/gg.c:1108
+#: src/protocols/gg/gg.c:1255
 msgid "Unable to read socket"
 msgstr "Ne morem brati vti�nice"
 
-#: src/protocols/gg/gg.c:959
-msgid "Gadu-Gadu Public Directory"
-msgstr "Javni imenik Gadu-Gadu"
-
-#: src/protocols/gg/gg.c:960
-msgid "Search results"
-msgstr "Rezultati iskanja"
+#: src/protocols/gg/gg.c:1191
+msgid "Buddy list downloaded"
+msgstr "Seznam prijateljev prenesen"
+
+#: src/protocols/gg/gg.c:1192
+msgid "Your buddy list was downloaded from the server."
+msgstr "Va邸 seznam prijateljev je bil prenesen s stre転nika."
+
+#: src/protocols/gg/gg.c:1199
+msgid "Buddy list uploaded"
+msgstr "Seznam prijateljev prenesen"
+
+#: src/protocols/gg/gg.c:1200
+msgid "Your buddy list was stored on the server."
+msgstr "Seznam prijateljev je bil shranjen na stre転niku."
+
+#: src/protocols/gg/gg.c:1289
+#: src/protocols/gg/gg.c:1507
+msgid "Connection failed."
+msgstr "Povezava ni uspela."
 
 #. zephyr has several exposures
 #. NONE (where you are hidden, and zephyrs to you are in practice silently dropped -- yes this is wrong)
@@ -4918,95 +5546,83 @@
 #.
 #. Away won't change their exposure but will set an auto away message (for IMs only)
 #.
-#: src/protocols/gg/gg.c:1087 src/protocols/jabber/buddy.c:1089
-#: src/protocols/napster/napster.c:578 src/protocols/oscar/oscar.c:713
-#: src/protocols/yahoo/yahoo.c:2639 src/protocols/zephyr/zephyr.c:2252
+#: src/protocols/gg/gg.c:1413
+#: src/protocols/jabber/buddy.c:1089
+#: src/protocols/napster/napster.c:584
+#: src/protocols/oscar/oscar.c:715
+#: src/protocols/yahoo/yahoo.c:2659
+#: src/protocols/zephyr/zephyr.c:2252
 msgid "Online"
 msgstr "Prisoten"
 
-#. type = gaim_status_type_new_with_attrs(GAIM_STATUS_UNAVAILABLE, "not-available", "Not Available",
-#. TRUE, TRUE, FALSE, "message", _("Message"),
-#. gaim_value_new(GAIM_TYPE_STRING), NULL);
-#. types = g_list_append(types, type);
-#: src/protocols/gg/gg.c:1106 src/protocols/msn/msn.c:585
-#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2828
-#: src/protocols/novell/novell.c:2962 src/protocols/novell/novell.c:3044
-#: src/protocols/silc/buddy.c:1421 src/protocols/silc/silc.c:54
-#: src/protocols/yahoo/yahoo.c:2617 src/protocols/yahoo/yahoo.c:3233
+#: src/protocols/gg/gg.c:1427
+#: src/protocols/msn/msn.c:593
+#: src/protocols/msn/state.c:31
+#: src/protocols/novell/novell.c:2854
+#: src/protocols/novell/novell.c:2992
+#: src/protocols/silc/buddy.c:1435
+#: src/protocols/silc/silc.c:55
+#: src/protocols/yahoo/yahoo.c:2637
+#: src/protocols/yahoo/yahoo.c:3215
 msgid "Busy"
 msgstr "Zaposlen"
 
-#: src/protocols/gg/gg.c:1111 src/protocols/msn/msn.c:554
+#: src/protocols/gg/gg.c:1432
+#: src/protocols/msn/msn.c:562
 msgid "Blocked"
 msgstr "Zavrnjeno"
 
-#: src/protocols/gg/gg.c:1129
+#: src/protocols/gg/gg.c:1449
 msgid "Add to chat"
 msgstr "Dodaj k pomenku"
 
-#: src/protocols/gg/gg.c:1133
+#: src/protocols/gg/gg.c:1454
 msgid "Unblock"
 msgstr "Prekli�i zavrnitev"
 
-#: src/protocols/gg/gg.c:1149
+#: src/protocols/gg/gg.c:1473
 msgid "Chat _name:"
 msgstr "_Ime za klepet:"
 
-#: src/protocols/gg/gg.c:1183
-msgid "Connection failed."
-msgstr "Povezava ni uspela."
-
-#: src/protocols/gg/gg.c:1357
+#: src/protocols/gg/gg.c:1692
 msgid "Chat error"
 msgstr "Napaka pri pomenku"
 
-#: src/protocols/gg/gg.c:1358
+#: src/protocols/gg/gg.c:1693
 msgid "This chat name is already in use"
 msgstr "Ime za pomenek 転e obstaja"
 
-#: src/protocols/gg/gg.c:1435
+#: src/protocols/gg/gg.c:1775
 msgid "Not connected to the server."
 msgstr "S stre転nikom niste povezani."
 
-#: src/protocols/gg/gg.c:1456
-msgid "Token Error: Unable to fetch the token.\n"
-msgstr "Napaka 転etona: Ni mogo�e prenesti 転etona.\n"
-
-#: src/protocols/gg/gg.c:1472
-msgid "e-Mail"
-msgstr "E-po邸ta"
-
-#: src/protocols/gg/gg.c:1495 src/protocols/gg/gg.c:1496
-msgid "Register New Gadu-Gadu Account"
-msgstr "Registrirajte nov ra�un za Gadu-Gadu"
-
-#: src/protocols/gg/gg.c:1497
-msgid "Please, fill in the following fields"
-msgstr "Prosimo, izpolnite naslednja polja"
-
-#: src/protocols/gg/gg.c:1515
-msgid "Change password"
-msgstr "Spremeni geslo"
-
-#: src/protocols/gg/gg.c:1520
+#: src/protocols/gg/gg.c:1798
+msgid "Find buddies..."
+msgstr "Poi邸�i prijatelje ..."
+
+#: src/protocols/gg/gg.c:1804
+msgid "Change password..."
+msgstr "Spremeni geslo ..."
+
+#: src/protocols/gg/gg.c:1810
 msgid "Upload buddylist to Server"
 msgstr "Izvozi seznam prijateljev na stre転nik"
 
-#: src/protocols/gg/gg.c:1523
+#: src/protocols/gg/gg.c:1814
 msgid "Download buddylist from Server"
 msgstr "Uvozi seznam prijateljev s stre転nika"
 
-#: src/protocols/gg/gg.c:1526
+#: src/protocols/gg/gg.c:1818
 msgid "Delete buddylist from Server"
 msgstr "Izbri邸i seznam prijateljev na stre転niku"
 
-#: src/protocols/gg/gg.c:1529
-msgid "Save buddylist to file"
-msgstr "Shrani seznam prijateljev v datoteko"
-
-#: src/protocols/gg/gg.c:1532
-msgid "Load buddylist from file"
-msgstr "Uvozi seznam prijateljev iz datoteke"
+#: src/protocols/gg/gg.c:1822
+msgid "Save buddylist to file..."
+msgstr "Shrani seznam prijateljev v datoteko ..."
+
+#: src/protocols/gg/gg.c:1826
+msgid "Load buddylist from file..."
+msgstr "Uvozi seznam prijateljev iz datoteke ..."
 
 #. magic
 #. major_version
@@ -5019,36 +5635,40 @@
 #. id
 #. name
 #. version
-#: src/protocols/gg/gg.c:1617
+#: src/protocols/gg/gg.c:1913
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Dodatek za protokol Gadu-Gadu"
 
 #. summary
-#: src/protocols/gg/gg.c:1618
+#: src/protocols/gg/gg.c:1914
 msgid "Polish popular IM"
 msgstr "Olep邸aj priljubljen program za neposredno sporo�anje"
 
-#: src/protocols/gg/gg.c:1665
+#: src/protocols/gg/gg.c:1962
 msgid "Gadu-Gadu User"
 msgstr "Uporabnik Gadu-Gadu"
 
-#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1313
+#: src/protocols/irc/cmds.c:43
+#: src/protocols/silc/silc.c:1562
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Neznan ukaz: %s"
 
-#: src/protocols/irc/cmds.c:468 src/protocols/jabber/chat.c:592
-#: src/protocols/silc/silc.c:1021
+#: src/protocols/irc/cmds.c:485
+#: src/protocols/jabber/chat.c:592
+#: src/protocols/silc/silc.c:1270
 #, c-format
 msgid "current topic is: %s"
 msgstr "trenutna tema je: %s"
 
-#: src/protocols/irc/cmds.c:472 src/protocols/jabber/chat.c:596
-#: src/protocols/silc/silc.c:1025
+#: src/protocols/irc/cmds.c:489
+#: src/protocols/jabber/chat.c:596
+#: src/protocols/silc/silc.c:1274
 msgid "No topic is set"
 msgstr "Ni teme"
 
-#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:173
+#: src/protocols/irc/dcc_send.c:272
+#: src/protocols/yahoo/yahoo_filexfer.c:173
 #: src/protocols/yahoo/yahoo_filexfer.c:182
 #: src/protocols/yahoo/yahoo_filexfer.c:191
 msgid "File Transfer Failed"
@@ -5058,78 +5678,92 @@
 msgid "Gaim could not open a listening port."
 msgstr "Gaim ni mogel odprti vrat za poslu邸anje."
 
-#: src/protocols/irc/irc.c:79
+#: src/protocols/irc/irc.c:78
 msgid "Error displaying MOTD"
 msgstr "Napaka pri prikazovanju MOTD"
 
-#: src/protocols/irc/irc.c:79
+#: src/protocols/irc/irc.c:78
 msgid "No MOTD available"
 msgstr "MOTD ni na voljo"
 
-#: src/protocols/irc/irc.c:80
+#: src/protocols/irc/irc.c:79
 msgid "There is no MOTD associated with this connection."
 msgstr "Noben MOTD ni povezan s to povezavo."
 
-#: src/protocols/irc/irc.c:83
+#: src/protocols/irc/irc.c:82
 #, c-format
 msgid "MOTD for %s"
 msgstr "MOTD za %s"
 
-#: src/protocols/irc/irc.c:103 src/protocols/irc/irc.c:522
-#: src/protocols/irc/irc.c:544
+#: src/protocols/irc/irc.c:102
+#: src/protocols/irc/irc.c:529
+#: src/protocols/irc/irc.c:551
 msgid "Server has disconnected"
 msgstr "Stre転nik ni ve� povezan"
 
-#: src/protocols/irc/irc.c:188
+#: src/protocols/irc/irc.c:187
 msgid "View MOTD"
 msgstr "Ogled MOTD"
 
-#: src/protocols/irc/irc.c:200 src/protocols/silc/chat.c:32
+#: src/protocols/irc/irc.c:199
+#: src/protocols/silc/chat.c:33
 msgid "_Channel:"
 msgstr "_Kanal:"
 
-#: src/protocols/irc/irc.c:206 src/protocols/jabber/chat.c:59
+#: src/protocols/irc/irc.c:205
+#: src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "_Geslo:"
 
-#: src/protocols/irc/irc.c:238
+#: src/protocols/irc/irc.c:237
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC vzdevki ne smejo vsebovati presledka"
 
-#: src/protocols/irc/irc.c:266 src/protocols/jabber/jabber.c:433
+#: src/protocols/irc/irc.c:265
+#: src/protocols/jabber/jabber.c:433
 #: src/protocols/jabber/jabber.c:770
 msgid "SSL support unavailable"
 msgstr "Podpora SSL ni na voljo"
 
-#: src/protocols/irc/irc.c:277 src/protocols/simple/simple.c:383
-#: src/protocols/simple/simple.c:1219
+#: src/protocols/irc/irc.c:276
+#: src/protocols/simple/simple.c:383
+#: src/protocols/simple/simple.c:1228
 msgid "Couldn't create socket"
 msgstr "Vti�nika ni bilo mogo�e ustvariti"
 
-#: src/protocols/irc/irc.c:348 src/protocols/jabber/jabber.c:306
-#: src/protocols/oscar/oscar.c:1744 src/protocols/oscar/oscar.c:1812
+#: src/protocols/irc/irc.c:347
+#: src/protocols/jabber/jabber.c:306
+#: src/protocols/oscar/oscar.c:1746
+#: src/protocols/oscar/oscar.c:1814
 msgid "Couldn't connect to host"
 msgstr "Nisem se mogel povezati do gostitelja"
 
-#: src/protocols/irc/irc.c:373 src/protocols/jabber/jabber.c:333
+#: src/protocols/irc/irc.c:372
+#: src/protocols/jabber/jabber.c:333
 msgid "Connection Failed"
 msgstr "Povezava ni uspela"
 
-#: src/protocols/irc/irc.c:376 src/protocols/jabber/jabber.c:336
+#: src/protocols/irc/irc.c:375
+#: src/protocols/jabber/jabber.c:336
 msgid "SSL Handshake Failed"
 msgstr "Rokovanje SSL ni uspelo"
 
-#: src/protocols/irc/irc.c:519 src/protocols/irc/irc.c:541
+#: src/protocols/irc/irc.c:526
+#: src/protocols/irc/irc.c:548
 msgid "Read error"
 msgstr "Napaka pri branju"
 
-#: src/protocols/irc/irc.c:690 src/protocols/silc/chat.c:1388
-#: src/protocols/yahoo/yahoochat.c:1376
+#: src/protocols/irc/irc.c:687
+#: src/protocols/silc/chat.c:1419
+#: src/protocols/yahoo/yahoochat.c:1378
 msgid "Users"
 msgstr "Uporabniki"
 
-#: src/protocols/irc/irc.c:693 src/protocols/silc/chat.c:1391
-#: src/protocols/silc/ops.c:1166 src/protocols/yahoo/yahoochat.c:1385
+#: src/protocols/irc/irc.c:690
+#: src/protocols/sametime/sametime.c:3368
+#: src/protocols/silc/chat.c:1422
+#: src/protocols/silc/ops.c:1380
+#: src/protocols/yahoo/yahoochat.c:1387
 msgid "Topic"
 msgstr "Tema"
 
@@ -5141,34 +5775,44 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:799
+#: src/protocols/irc/irc.c:797
 msgid "IRC Protocol Plugin"
 msgstr "Vstavek za protokol IRC"
 
 #. *  summary
-#: src/protocols/irc/irc.c:800
+#: src/protocols/irc/irc.c:798
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Vstavek za protokol IRC, ki je manj beden"
 
-#: src/protocols/irc/irc.c:819 src/protocols/irc/msgs.c:233
-#: src/protocols/jabber/jabber.c:1708 src/protocols/napster/napster.c:707
-#: src/protocols/simple/simple.c:1428 src/protocols/silc/ops.c:1028
-#: src/protocols/silc/ops.c:1130
+#. host to connect to
+#: src/protocols/irc/irc.c:817
+#: src/protocols/irc/msgs.c:233
+#: src/protocols/jabber/jabber.c:1710
+#: src/protocols/napster/napster.c:714
+#: src/protocols/sametime/sametime.c:5663
+#: src/protocols/silc/ops.c:1242
+#: src/protocols/silc/ops.c:1344
+#: src/protocols/simple/simple.c:1438
 msgid "Server"
 msgstr "Stre転nik"
 
-#: src/protocols/irc/irc.c:825
+#: src/protocols/irc/irc.c:823
 msgid "Encodings"
 msgstr "Kodiranje znakov"
 
-#: src/protocols/irc/irc.c:828 src/protocols/irc/msgs.c:227
-#: src/protocols/jabber/jabber.c:628 src/protocols/silc/buddy.c:1483
-#: src/protocols/silc/ops.c:975 src/protocols/silc/ops.c:977
-#: src/protocols/silc/ops.c:1124 src/protocols/silc/ops.c:1126
+#: src/protocols/irc/irc.c:826
+#: src/protocols/irc/msgs.c:227
+#: src/protocols/jabber/jabber.c:628
+#: src/protocols/silc/buddy.c:1497
+#: src/protocols/silc/ops.c:1189
+#: src/protocols/silc/ops.c:1191
+#: src/protocols/silc/ops.c:1338
+#: src/protocols/silc/ops.c:1340
+#: src/protocols/silc/silc.c:919
 msgid "Username"
 msgstr "Uporabni邸ko ime"
 
-#: src/protocols/irc/irc.c:831
+#: src/protocols/irc/irc.c:829
 msgid "Real name"
 msgstr "Resni�no ime"
 
@@ -5176,7 +5820,7 @@
 #. option = gaim_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: src/protocols/irc/irc.c:839
+#: src/protocols/irc/irc.c:837
 msgid "Use SSL"
 msgstr "Uporabi SSL"
 
@@ -5198,14 +5842,16 @@
 msgid "Cannot ban %s: banlist is full"
 msgstr "Prepovedati %s ni mo転no: seznam prepovedanih je poln"
 
-#: src/protocols/irc/msgs.c:213 src/protocols/irc/msgs.c:233
+#: src/protocols/irc/msgs.c:213
+#: src/protocols/irc/msgs.c:233
 #: src/protocols/irc/msgs.c:246
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: src/protocols/irc/msgs.c:213 src/protocols/oscar/oscar.c:5952
-#: src/protocols/silc/ops.c:1198
+#: src/protocols/irc/msgs.c:213
+#: src/protocols/oscar/oscar.c:6001
+#: src/protocols/silc/ops.c:1412
 msgid "Nick"
 msgstr "Vzdevek"
 
@@ -5217,19 +5863,24 @@
 msgid " <i>(identified)</i>"
 msgstr " <i>(identified)</i>"
 
-#: src/protocols/irc/msgs.c:221 src/protocols/irc/msgs.c:227
-#: src/protocols/irc/msgs.c:228 src/protocols/irc/msgs.c:239
+#: src/protocols/irc/msgs.c:221
+#: src/protocols/irc/msgs.c:227
+#: src/protocols/irc/msgs.c:228
+#: src/protocols/irc/msgs.c:239
 #: src/protocols/yahoo/yahoo_profile.c:660
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:228 src/protocols/silc/ops.c:969
-#: src/protocols/silc/ops.c:1118 src/protocols/yahoo/yahoo_profile.c:1005
+#: src/protocols/irc/msgs.c:228
+#: src/protocols/silc/ops.c:1183
+#: src/protocols/silc/ops.c:1332
+#: src/protocols/yahoo/yahoo_profile.c:1005
 msgid "Realname"
 msgstr "Pravo ime"
 
-#: src/protocols/irc/msgs.c:239 src/protocols/silc/ops.c:1041
+#: src/protocols/irc/msgs.c:239
+#: src/protocols/silc/ops.c:1255
 msgid "Currently on"
 msgstr "Trenutno na"
 
@@ -5274,103 +5925,100 @@
 msgid "Users on %s: %s"
 msgstr "Uporabniki na %s: %s"
 
-#: src/protocols/irc/msgs.c:482
+#: src/protocols/irc/msgs.c:491
 msgid "Time Response"
 msgstr "�asovni odziv"
 
-#: src/protocols/irc/msgs.c:483
+#: src/protocols/irc/msgs.c:492
 msgid "The IRC server's local time is:"
 msgstr "Krajevni �as stre転nika IRC je:"
 
-#: src/protocols/irc/msgs.c:494
+#: src/protocols/irc/msgs.c:503
 msgid "No such channel"
 msgstr "Ta kanal ne obstaja"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:505
+#: src/protocols/irc/msgs.c:514
 msgid "no such channel"
 msgstr "ta kanal ne obstaja"
 
-#: src/protocols/irc/msgs.c:508
+#: src/protocols/irc/msgs.c:517
 msgid "User is not logged in"
 msgstr "Uporabnik ni prijavljen"
 
-#: src/protocols/irc/msgs.c:513
+#: src/protocols/irc/msgs.c:522
 msgid "No such nick or channel"
 msgstr "Tak kanal ali vzdevek ne obstaja"
 
-#: src/protocols/irc/msgs.c:533
+#: src/protocols/irc/msgs.c:542
 msgid "Could not send"
 msgstr "Ni bilo mogo�e poslati"
 
-#: src/protocols/irc/msgs.c:589
+#: src/protocols/irc/msgs.c:598
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Pridru転evanje kanalu %s zahteva povabilo."
 
-#: src/protocols/irc/msgs.c:590
+#: src/protocols/irc/msgs.c:599
 msgid "Invitation only"
 msgstr "Samo na povabilo"
 
-#: src/protocols/irc/msgs.c:692
+#: src/protocols/irc/msgs.c:701
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Brcnil vas je %s: (%s)"
 
-#: src/protocols/irc/msgs.c:697
+#: src/protocols/irc/msgs.c:706
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Brcnil vas je %s (%s)"
 
-#: src/protocols/irc/msgs.c:721
+#: src/protocols/irc/msgs.c:730
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "na�in (%s %s) nastavil %s"
 
-#: src/protocols/irc/msgs.c:805
-msgid ""
-"Your selected account name was rejected by the server.  It probably contains "
-"invalid characters."
-msgstr ""
-"Va邸e izbrano ime ra�una je stre転nik zavrnil. Najverjetneje vsebuje "
-"neveljavne znake."
-
-#: src/protocols/irc/msgs.c:844
+#: src/protocols/irc/msgs.c:814
+msgid "Your selected account name was rejected by the server.  It probably contains invalid characters."
+msgstr "Va邸e izbrano ime ra�una je stre転nik zavrnil. Najverjetneje vsebuje neveljavne znake."
+
+#: src/protocols/irc/msgs.c:853
 msgid "Cannot change nick"
 msgstr "Vzdevka ne morem spremeniti"
 
-#: src/protocols/irc/msgs.c:844
+#: src/protocols/irc/msgs.c:853
 msgid "Could not change nick"
 msgstr "Vzdevka ni bilo mogo�e spremeniti"
 
-#: src/protocols/irc/msgs.c:865
+#: src/protocols/irc/msgs.c:874
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Zapustili ste kanal%s%s"
 
-#: src/protocols/irc/msgs.c:907
+#: src/protocols/irc/msgs.c:916
 msgid "Error: invalid PONG from server"
 msgstr "Napaka: Neveljaven PONG odgovor stre転nika"
 
-#: src/protocols/irc/msgs.c:909
+#: src/protocols/irc/msgs.c:918
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING odgovor - Zakasnitev: %lu sekund"
 
-#: src/protocols/irc/msgs.c:984
+#: src/protocols/irc/msgs.c:993
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Ne morem se pridru転iti %s:"
 
-#: src/protocols/irc/msgs.c:985 src/protocols/silc/ops.c:914
+#: src/protocols/irc/msgs.c:994
+#: src/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Ne morem se pridru転iti kanalu"
 
-#: src/protocols/irc/msgs.c:1019
+#: src/protocols/irc/msgs.c:1028
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Nadimek ali kanal je trenutno nedostopen."
 
-#: src/protocols/irc/msgs.c:1031
+#: src/protocols/irc/msgs.c:1040
 #, c-format
 msgid "Wallops from %s"
 msgstr "Mo�ni udarci od %s"
@@ -5380,247 +6028,188 @@
 msgstr "dejanje &lt;dejanje za izvedbo&gt;:  Izvedi dejanje."
 
 #: src/protocols/irc/parse.c:115
-msgid ""
-"away [message]:  Set an away message, or use no message to return from being "
-"away."
-msgstr ""
-"odsoten [sporo�ilo]:  Nastavite sporo�ilo za odsotnost ali ne uporabite "
-"sporo�ila za vrnitev iz odsotnosti."
+msgid "away [message]:  Set an away message, or use no message to return from being away."
+msgstr "odsoten [sporo�ilo]:  Nastavite sporo�ilo za odsotnost ali ne uporabite sporo�ila za vrnitev iz odsotnosti."
 
 #: src/protocols/irc/parse.c:116
-msgid ""
-"deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
-"someone. You must be a channel operator to do this."
-msgstr ""
-"deop &lt;vzdevek1&gt; [vzdevek2] ...:  Odstrani status operaterja kanala "
-"nekomu. Za to dejanje morate biti operater kanala."
+msgid "chanserv: Send a command to chanserv"
+msgstr "chanserv:  po邸lji ukaz chanservu"
 
 #: src/protocols/irc/parse.c:117
-msgid ""
-"devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
-"someone, preventing them from speaking if the channel is moderated (+m). You "
-"must be a channel operator to do this."
-msgstr ""
-"devoice &lt;nick1&gt; [nick2] ...:  Odstrani glasovni status kanala nekomu, "
-"kar mu bo prepre�ilo ogla邸anje, ko je kanal moderiran (+m). Za to dejanje "
-"morate biti operater kanala."
+msgid "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from someone. You must be a channel operator to do this."
+msgstr "deop &lt;vzdevek1&gt; [vzdevek2] ...:  Odstrani status operaterja kanala nekomu. Za to dejanje morate biti operater kanala."
 
 #: src/protocols/irc/parse.c:118
-msgid ""
-"invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
-"channel, or the current channel."
-msgstr ""
-"invite &lt;vzdevek&gt; [soba]: Povabite nekoga, da se vam pridru転i v "
-"navedenem ali trenutnem kanalu."
+msgid "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from someone, preventing them from speaking if the channel is moderated (+m). You must be a channel operator to do this."
+msgstr "devoice &lt;nick1&gt; [nick2] ...:  Odstrani glasovni status kanala nekomu, kar mu bo prepre�ilo ogla邸anje, ko je kanal moderiran (+m). Za to dejanje morate biti operater kanala."
 
 #: src/protocols/irc/parse.c:119
-msgid ""
-"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
-"channels, optionally providing a channel key for each if needed."
-msgstr ""
-"j &lt;soba1&gt;[,soba2][,...] [klju�1[,klju�2][,...]]:  Vnesite enega ali "
-"ve� kanalov, za ketere lahko po 転elji navedete tudi klju�e."
+msgid "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified channel, or the current channel."
+msgstr "invite &lt;vzdevek&gt; [soba]: Povabite nekoga, da se vam pridru転i v navedenem ali trenutnem kanalu."
 
 #: src/protocols/irc/parse.c:120
-msgid ""
-"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
-"channels, optionally providing a channel key for each if needed."
-msgstr ""
-"join &lt;soba1&gt;[,soba2][,...] [klju�1[,klju�2][,...]]:  Vnesite enega ali "
-"ve� kanalov, za ketere lahko po 転elji navedete tudi klju�e."
+msgid "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more channels, optionally providing a channel key for each if needed."
+msgstr "j &lt;soba1&gt;[,soba2][,...] [klju�1[,klju�2][,...]]:  Vnesite enega ali ve� kanalov, za ketere lahko po 転elji navedete tudi klju�e."
 
 #: src/protocols/irc/parse.c:121
-msgid ""
-"kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
-"channel operator to do this."
-msgstr ""
-"kick &lt;vzdevek&gt; [sporo�ilo]:  Odstranite nekoga iz kanala. Za to "
-"dejanje morate biti operater kanala."
+msgid "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more channels, optionally providing a channel key for each if needed."
+msgstr "join &lt;soba1&gt;[,soba2][,...] [klju�1[,klju�2][,...]]:  Vnesite enega ali ve� kanalov, za ketere lahko po 転elji navedete tudi klju�e."
 
 #: src/protocols/irc/parse.c:122
-msgid ""
-"list:  Display a list of chat rooms on the network. <i>Warning, some servers "
-"may disconnect you upon doing this.</i>"
-msgstr ""
-"list:  Prika転i seznam pogovornih sob v omre転ju. <i>Opozorilo: nekateri "
-"stre転niki vas lahko med tem odklopijo.</i>"
+msgid "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a channel operator to do this."
+msgstr "kick &lt;vzdevek&gt; [sporo�ilo]:  Odstranite nekoga iz kanala. Za to dejanje morate biti operater kanala."
 
 #: src/protocols/irc/parse.c:123
-msgid "me &lt;action to perform&gt;:  Perform an action."
-msgstr "me &lt;dejanje za izvedbo&gt;:  Izvedi dejanje."
+msgid "list:  Display a list of chat rooms on the network. <i>Warning, some servers may disconnect you upon doing this.</i>"
+msgstr "list:  Prika転i seznam pogovornih sob v omre転ju. <i>Opozorilo: nekateri stre転niki vas lahko med tem odklopijo.</i>"
 
 #: src/protocols/irc/parse.c:124
-msgid ""
-"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
-"or user mode."
-msgstr ""
-"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;vzdevek|kanal&gt;:  Nastavi ali "
-"razveljavi na�in uporabnika ali kanala."
+msgid "me &lt;action to perform&gt;:  Perform an action."
+msgstr "me &lt;dejanje za izvedbo&gt;:  Izvedi dejanje."
 
 #: src/protocols/irc/parse.c:125
-msgid ""
-"msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
-"opposed to a channel)."
-msgstr ""
-"msg &lt;vzdevek&gt; &lt;sporo�ilo&gt;:  Po邸lji zasebno sporo�ilo uporabniku "
-"(za razliko od kanala)."
+msgid "memoserv: Send a command to memoserv"
+msgstr "memoserv:  Po邸lji ukaz memoservu"
 
 #: src/protocols/irc/parse.c:126
+msgid "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel or user mode."
+msgstr "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;vzdevek|kanal&gt;:  Nastavi ali razveljavi na�in uporabnika ali kanala."
+
+#: src/protocols/irc/parse.c:127
+msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel)."
+msgstr "msg &lt;vzdevek&gt; &lt;sporo�ilo&gt;:  Po邸lji zasebno sporo�ilo uporabniku (za razliko od kanala)."
+
+#: src/protocols/irc/parse.c:128
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [kanal]:  Seznam uporabnikov, ki so trenutno na kanalu."
 
-#: src/protocols/irc/parse.c:127 src/protocols/jabber/jabber.c:1555
+#: src/protocols/irc/parse.c:129
+#: src/protocols/jabber/jabber.c:1555
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;nov vzdevek&gt;:  Spremenite va邸 vzdevek."
 
-#: src/protocols/irc/parse.c:128
-msgid ""
-"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
-"must be a channel operator to do this."
-msgstr ""
-"op &lt;vzdevek1&gt; [vzdevek2] ...:  Podelite status operaterja kanala "
-"nekomu. Za to dejanje morate biti operater kanala."
-
-#: src/protocols/irc/parse.c:129
-msgid ""
-"operwall &lt;message&gt;:  If you don't know what this is, you probably "
-"can't use it."
-msgstr ""
-"operwall &lt;sporo�ilo&gt;:  �e ne veste, kaj je to, tega verjetno ne morete "
-"uporabiti."
-
 #: src/protocols/irc/parse.c:130
-msgid ""
-"part [room] [message]:  Leave the current channel, or a specified channel, "
-"with an optional message."
-msgstr ""
-"part [soba] [sporo�ilo]:  Zapusti trenutni ali dolo�en kanal z mo転nostjo "
-"sporo�ila."
+msgid "nickserv: Send a command to nickserv"
+msgstr "nickserv:  po邸lji ukaz nickservu"
 
 #: src/protocols/irc/parse.c:131
-msgid ""
-"ping [nick]:  Asks how much lag a user (or the server if no user specified) "
-"has."
-msgstr ""
-"ping [vzdevek]:  Vpra邸a koliko zaostanka ima uporabnik (ali stre転nik, �e "
-"uporabnik ni naveden)."
+msgid "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You must be a channel operator to do this."
+msgstr "op &lt;vzdevek1&gt; [vzdevek2] ...:  Podelite status operaterja kanala nekomu. Za to dejanje morate biti operater kanala."
 
 #: src/protocols/irc/parse.c:132
-msgid ""
-"query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
-"opposed to a channel)."
-msgstr ""
-"query &lt;vzdevek&gt; &lt;sporo�ilo&gt;:  Po邸lji zasebno sporo�ilo "
-"uporabniku (za razliko od kanala)."
+msgid "operwall &lt;message&gt;:  If you don't know what this is, you probably can't use it."
+msgstr "operwall &lt;sporo�ilo&gt;:  �e ne veste, kaj je to, tega verjetno ne morete uporabiti."
 
 #: src/protocols/irc/parse.c:133
-msgid "quit [message]:  Disconnect from the server, with an optional message."
-msgstr ""
-"quit [sporo�ilo]:  Prekinitev povezave s stre転nikom z mo転nostjo sporo�ila."
+msgid "operserv: Send a command to operserv"
+msgstr "operserv:  po邸lji ukaz operservu"
 
 #: src/protocols/irc/parse.c:134
-msgid "quote [...]:  Send a raw command to the server."
-msgstr "quote [...]:  Po邸lji surov ukaz stre転niku."
+msgid "part [room] [message]:  Leave the current channel, or a specified channel, with an optional message."
+msgstr "part [soba] [sporo�ilo]:  Zapusti trenutni ali dolo�en kanal z mo転nostjo sporo�ila."
 
 #: src/protocols/irc/parse.c:135
-msgid ""
-"remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
-"channel operator to do this."
-msgstr ""
-"remove &lt;vzdevek&gt; [sporo�ilo]:  Odstrani nekoga iz sobe. Za to dejanje "
-"morate biti operater kanala."
+msgid "ping [nick]:  Asks how much lag a user (or the server if no user specified) has."
+msgstr "ping [vzdevek]:  Vpra邸a koliko zaostanka ima uporabnik (ali stre転nik, �e uporabnik ni naveden)."
 
 #: src/protocols/irc/parse.c:136
-msgid "time: Displays the current local time at the IRC server."
-msgstr "time: Prika転e trenutni krajevni �as na stre転niku IRC."
+msgid "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel)."
+msgstr "query &lt;vzdevek&gt; &lt;sporo�ilo&gt;:  Po邸lji zasebno sporo�ilo uporabniku (za razliko od kanala)."
 
 #: src/protocols/irc/parse.c:137
-msgid "topic [new topic]:  View or change the channel topic."
-msgstr "topic [nova tema]:  Oglejte si ali zamenjajte temo kanala."
+msgid "quit [message]:  Disconnect from the server, with an optional message."
+msgstr "quit [sporo�ilo]:  Prekinitev povezave s stre転nikom z mo転nostjo sporo�ila."
 
 #: src/protocols/irc/parse.c:138
-msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
-msgstr ""
-"umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Nastavi ali odvzemi na�in uporabnika."
+msgid "quote [...]:  Send a raw command to the server."
+msgstr "quote [...]:  Po邸lji surov ukaz stre転niku."
 
 #: src/protocols/irc/parse.c:139
-msgid ""
-"voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
-"must be a channel operator to do this."
-msgstr ""
-"voice &lt;vzdevek1&gt; [vzdevek2] ...:  Podelite status operaterja kanala "
-"nekomu. Za to dejanje morate biti operater kanala."
+msgid "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a channel operator to do this."
+msgstr "remove &lt;vzdevek&gt; [sporo�ilo]:  Odstrani nekoga iz sobe. Za to dejanje morate biti operater kanala."
 
 #: src/protocols/irc/parse.c:140
-msgid ""
-"wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
-"use it."
-msgstr ""
-"wallops &lt;sporo�ilo&gt;:  �e ne veste, kaj je to, tega verjetno ne morete "
-"uporabiti."
+msgid "time: Displays the current local time at the IRC server."
+msgstr "time: Prika転e trenutni krajevni �as na stre転niku IRC."
 
 #: src/protocols/irc/parse.c:141
+msgid "topic [new topic]:  View or change the channel topic."
+msgstr "topic [nova tema]:  Oglejte si ali zamenjajte temo kanala."
+
+#: src/protocols/irc/parse.c:142
+msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
+msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Nastavi ali odvzemi na�in uporabnika."
+
+#: src/protocols/irc/parse.c:143
+msgid "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You must be a channel operator to do this."
+msgstr "voice &lt;vzdevek1&gt; [vzdevek2] ...:  Podelite status operaterja kanala nekomu. Za to dejanje morate biti operater kanala."
+
+#: src/protocols/irc/parse.c:144
+msgid "wallops &lt;message&gt;:  If you don't know what this is, you probably can't use it."
+msgstr "wallops &lt;sporo�ilo&gt;:  �e ne veste, kaj je to, tega verjetno ne morete uporabiti."
+
+#: src/protocols/irc/parse.c:145
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [stre転nik] &lt;vzdevek&gt;:  Dobi ve� informacij o uporabniku."
 
-#: src/protocols/irc/parse.c:422
+#: src/protocols/irc/parse.c:439
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "�as odgovora od %s: %lu sekund"
 
-#: src/protocols/irc/parse.c:423
+#: src/protocols/irc/parse.c:440
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:423
+#: src/protocols/irc/parse.c:440
 msgid "CTCP PING reply"
 msgstr "CTCP PING ogdovor"
 
-#: src/protocols/irc/parse.c:526 src/protocols/irc/parse.c:530
-#: src/protocols/oscar/oscar.c:1653 src/protocols/toc/toc.c:190
-#: src/protocols/toc/toc.c:688 src/protocols/toc/toc.c:704
+#: src/protocols/irc/parse.c:543
+#: src/protocols/irc/parse.c:547
+#: src/protocols/oscar/oscar.c:1655
+#: src/protocols/toc/toc.c:190
+#: src/protocols/toc/toc.c:688
+#: src/protocols/toc/toc.c:704
 #: src/protocols/toc/toc.c:780
 msgid "Disconnected."
 msgstr "Povezava prekinjena."
 
 #: src/protocols/jabber/auth.c:51
-msgid ""
-"Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
-"account properties"
-msgstr ""
-"Za prijavo potrebuje stre転nik TLS/SSL. Izberite \"Uporabi TLS, �e je na voljo"
-"\" v lastnostih ra�una."
+msgid "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in account properties"
+msgstr "Za prijavo potrebuje stre転nik TLS/SSL. Izberite \"Uporabi TLS, �e je na voljo\" v lastnostih ra�una."
 
 #: src/protocols/jabber/auth.c:53
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
-msgstr ""
-"Stre転nik zahteva TLS/SSL za prijavo. Podpore za TLS/SSL ni mogo�e najti."
+msgstr "Stre転nik zahteva TLS/SSL za prijavo. Podpore za TLS/SSL ni mogo�e najti."
 
 #: src/protocols/jabber/auth.c:114
 msgid "Server requires plaintext authentication over an unencrypted stream"
-msgstr ""
-"Stre転nik zahteva overovitev z navadnim besedilom preko ne邸ifriranega toka"
-
-#: src/protocols/jabber/auth.c:133 src/protocols/jabber/auth.c:207
-#: src/protocols/jabber/auth.c:375 src/protocols/jabber/auth.c:473
-#: src/protocols/jabber/auth.c:485 src/protocols/jabber/jabber.c:110
+msgstr "Stre転nik zahteva overovitev z navadnim besedilom preko ne邸ifriranega toka"
+
+#: src/protocols/jabber/auth.c:133
+#: src/protocols/jabber/auth.c:207
+#: src/protocols/jabber/auth.c:375
+#: src/protocols/jabber/auth.c:473
+#: src/protocols/jabber/auth.c:485
+#: src/protocols/jabber/jabber.c:110
 msgid "Invalid response from server."
 msgstr "Neveljaven odgovor stre転nika."
 
-#: src/protocols/jabber/auth.c:163 src/protocols/jabber/auth.c:164
-#: src/protocols/jabber/auth.c:244 src/protocols/jabber/auth.c:245
+#: src/protocols/jabber/auth.c:163
+#: src/protocols/jabber/auth.c:164
+#: src/protocols/jabber/auth.c:244
+#: src/protocols/jabber/auth.c:245
 msgid "Plaintext Authentication"
 msgstr "Overovitev z navadnim besedilom"
 
-#: src/protocols/jabber/auth.c:165 src/protocols/jabber/auth.c:246
-msgid ""
-"This server requires plaintext authentication over an unencrypted "
-"connection.  Allow this and continue authentication?"
-msgstr ""
-"Stre転nik zahteva overovitev z navadnim besedilom preko ne邸ifrirane povezave. "
-"Se strinjate s tem in 転elite nadaljevati z overovitvijo?"
-
-#: src/protocols/jabber/auth.c:173 src/protocols/jabber/auth.c:254
+#: src/protocols/jabber/auth.c:165
+#: src/protocols/jabber/auth.c:246
+msgid "This server requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"
+msgstr "Stre転nik zahteva overovitev z navadnim besedilom preko ne邸ifrirane povezave. Se strinjate s tem in 転elite nadaljevati z overovitvijo?"
+
+#: src/protocols/jabber/auth.c:173
+#: src/protocols/jabber/auth.c:254
 msgid "Server does not use any supported authentication method"
 msgstr "Stre転nik ne uporablja nobene podprte metode overovitve"
 
@@ -5628,96 +6217,115 @@
 msgid "Invalid challenge from server"
 msgstr "Neveljaven poziv stre転nika"
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:667
-#: src/protocols/silc/ops.c:806
+#: src/protocols/jabber/buddy.c:249
+#: src/protocols/jabber/buddy.c:667
+#: src/protocols/silc/ops.c:1020
 msgid "Full Name"
 msgstr "Polno ime"
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:680
-#: src/protocols/silc/ops.c:818
+#: src/protocols/jabber/buddy.c:250
+#: src/protocols/jabber/buddy.c:680
+#: src/protocols/silc/ops.c:1032
 msgid "Family Name"
 msgstr "Dru転insko ime"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:684
+#: src/protocols/jabber/buddy.c:251
+#: src/protocols/jabber/buddy.c:684
 msgid "Given Name"
 msgstr "Ime"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/jabber.c:688
+#: src/protocols/jabber/buddy.c:253
+#: src/protocols/jabber/jabber.c:688
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:726
+#: src/protocols/jabber/buddy.c:254
+#: src/protocols/jabber/buddy.c:726
 msgid "Street Address"
 msgstr "Naslov"
 
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:722
+#: src/protocols/jabber/buddy.c:255
+#: src/protocols/jabber/buddy.c:722
 msgid "Extended Address"
 msgstr "Naslov (dodatno)"
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:730
+#: src/protocols/jabber/buddy.c:256
+#: src/protocols/jabber/buddy.c:730
 msgid "Locality"
 msgstr "Okraj"
 
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:734
+#: src/protocols/jabber/buddy.c:257
+#: src/protocols/jabber/buddy.c:734
 msgid "Region"
 msgstr "Regija"
 
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:738
+#: src/protocols/jabber/buddy.c:258
+#: src/protocols/jabber/buddy.c:738
 #: src/protocols/jabber/jabber.c:678
 msgid "Postal Code"
 msgstr "Po邸tna 邸tevilka"
 
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:743
+#: src/protocols/jabber/buddy.c:259
+#: src/protocols/jabber/buddy.c:743
+#: src/protocols/silc/silc.c:929
 msgid "Country"
 msgstr "Dr転ava"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:754
+#: src/protocols/jabber/buddy.c:260
+#: src/protocols/jabber/buddy.c:754
 #: src/protocols/jabber/buddy.c:761
 msgid "Telephone"
 msgstr "Telefon"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:795
+#: src/protocols/jabber/buddy.c:262
+#: src/protocols/jabber/buddy.c:795
 msgid "Organization Name"
 msgstr "Ime organizacije"
 
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:799
+#: src/protocols/jabber/buddy.c:263
+#: src/protocols/jabber/buddy.c:799
 msgid "Organization Unit"
 msgstr "Enota organizacije"
 
-#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:808
+#: src/protocols/jabber/buddy.c:265
+#: src/protocols/jabber/buddy.c:808
 msgid "Role"
 msgstr "Funkcija"
 
-#: src/protocols/jabber/buddy.c:266 src/protocols/jabber/buddy.c:701
-#: src/protocols/oscar/oscar.c:5987
+#: src/protocols/jabber/buddy.c:266
+#: src/protocols/jabber/buddy.c:701
+#: src/protocols/oscar/oscar.c:6036
 msgid "Birthday"
 msgstr "Rojstni dan"
 
-#: src/protocols/jabber/buddy.c:567 src/protocols/jabber/buddy.c:568
+#: src/protocols/jabber/buddy.c:567
+#: src/protocols/jabber/buddy.c:568
 msgid "Edit Jabber vCard"
 msgstr "Urejanje Jabber vVizitke"
 
 #: src/protocols/jabber/buddy.c:569
-msgid ""
-"All items below are optional. Enter only the information with which you feel "
-"comfortable."
+msgid "All items below are optional. Enter only the information with which you feel comfortable."
 msgstr "Vsa spodnja polja so izbirna. Vnesite samo informacije, ki jih 転elite."
 
 #: src/protocols/jabber/buddy.c:616
 msgid "Jabber ID"
 msgstr "Jabber ID oznaka"
 
-#: src/protocols/jabber/buddy.c:642 src/protocols/jabber/jabber.c:1711
+#: src/protocols/jabber/buddy.c:642
+#: src/protocols/jabber/jabber.c:1713
 msgid "Resource"
 msgstr "Vir"
 
-#: src/protocols/jabber/buddy.c:688 src/protocols/silc/ops.c:814
+#: src/protocols/jabber/buddy.c:688
+#: src/protocols/silc/ops.c:1028
 msgid "Middle Name"
 msgstr "Drugo ime"
 
-#: src/protocols/jabber/buddy.c:706 src/protocols/jabber/jabber.c:663
-#: src/protocols/oscar/oscar.c:6005 src/protocols/oscar/oscar.c:6013
-#: src/protocols/silc/ops.c:850
+#: src/protocols/jabber/buddy.c:706
+#: src/protocols/jabber/jabber.c:663
+#: src/protocols/oscar/oscar.c:6054
+#: src/protocols/oscar/oscar.c:6062
+#: src/protocols/silc/ops.c:1064
 msgid "Address"
 msgstr "Naslov"
 
@@ -5757,42 +6365,51 @@
 msgid "Unsubscribe"
 msgstr "Odjavi"
 
-#: src/protocols/jabber/buddy.c:1085 src/protocols/jabber/chat.c:677
-#: src/protocols/jabber/chat.c:688 src/protocols/jabber/jabber.c:1018
-#: src/protocols/silc/ops.c:1235
+#: src/protocols/jabber/buddy.c:1085
+#: src/protocols/jabber/chat.c:677
+#: src/protocols/jabber/chat.c:688
+#: src/protocols/jabber/jabber.c:1018
+#: src/protocols/silc/ops.c:1449
 msgid "Error"
 msgstr "Napaka"
 
-#: src/protocols/jabber/buddy.c:1091 src/protocols/jabber/jabber.c:1047
+#: src/protocols/jabber/buddy.c:1091
+#: src/protocols/jabber/jabber.c:1047
 msgid "Chatty"
 msgstr "Pomenek"
 
-#: src/protocols/jabber/buddy.c:1095 src/protocols/jabber/jabber.c:1063
-#: src/status.c:159
+#: src/protocols/jabber/buddy.c:1095
+#: src/protocols/jabber/jabber.c:1063
+#: src/status.c:158
 msgid "Extended Away"
 msgstr "Odsotnost - Napredno"
 
-#: src/protocols/jabber/buddy.c:1097 src/protocols/jabber/jabber.c:1071
-#: src/protocols/oscar/oscar.c:701 src/protocols/oscar/oscar.c:7791
-#: src/protocols/sametime/sametime.c:2770
+#: src/protocols/jabber/buddy.c:1097
+#: src/protocols/jabber/jabber.c:1071
+#: src/protocols/oscar/oscar.c:703
+#: src/protocols/oscar/oscar.c:7825
+#: src/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "Ne moti"
 
 #: src/protocols/jabber/buddy.c:1235
 msgid "The following are the results of your search"
-msgstr ""
+msgstr "To so rezultati va邸ega iskanja"
 
 #: src/protocols/jabber/buddy.c:1327
 msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr ""
-
-#: src/protocols/jabber/buddy.c:1331 src/protocols/jabber/jabber.c:653
-#: src/protocols/oscar/oscar.c:5962 src/protocols/silc/ops.c:810
+msgstr "Izpolnite eno ali ve� polj za iskanje uporabnikov Jabberja."
+
+#: src/protocols/jabber/buddy.c:1331
+#: src/protocols/jabber/jabber.c:653
+#: src/protocols/oscar/oscar.c:6011
+#: src/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "Ime"
 
-#: src/protocols/jabber/buddy.c:1336 src/protocols/jabber/jabber.c:658
-#: src/protocols/oscar/oscar.c:5963
+#: src/protocols/jabber/buddy.c:1336
+#: src/protocols/jabber/jabber.c:658
+#: src/protocols/oscar/oscar.c:6012
 msgid "Last Name"
 msgstr "Priimek"
 
@@ -5800,32 +6417,29 @@
 msgid "E-Mail Address"
 msgstr "E-po邸tni Naslov"
 
-#: src/protocols/jabber/buddy.c:1355 src/protocols/jabber/buddy.c:1356
-#, fuzzy
+#: src/protocols/jabber/buddy.c:1355
+#: src/protocols/jabber/buddy.c:1356
 msgid "Search for Jabber users"
-msgstr "I邸�i prijatelje po naslovu e-po邸te"
+msgstr "I邸�i uporabnike Jabberja"
 
 #: src/protocols/jabber/buddy.c:1370
-#, fuzzy
 msgid "Invalid Directory"
-msgstr "Neveljavna napaka"
+msgstr "Neveljaven imenik"
 
 #: src/protocols/jabber/buddy.c:1387
-#, fuzzy
 msgid "Enter a User Directory"
-msgstr "Imenika ni mogo�e poslati."
+msgstr "Vnesi uporabni邸ki imenik"
 
 #: src/protocols/jabber/buddy.c:1388
-#, fuzzy
 msgid "Select a user directory to search"
-msgstr "Izberite konferen�ni stre転nik za pogovor"
+msgstr "Izberite imenik za iskanje"
 
 #: src/protocols/jabber/buddy.c:1391
-#, fuzzy
 msgid "Search Directory"
-msgstr "Rezultati iskanja"
-
-#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:7318
+msgstr "Imenik iskanja"
+
+#: src/protocols/jabber/chat.c:41
+#: src/protocols/oscar/oscar.c:7344
 #: src/protocols/yahoo/yahoochat.c:979
 msgid "_Room:"
 msgstr "_Soba:"
@@ -5852,7 +6466,8 @@
 msgid "%s is not a valid server name"
 msgstr "%s ni veljavno ime stre転nika"
 
-#: src/protocols/jabber/chat.c:230 src/protocols/jabber/chat.c:231
+#: src/protocols/jabber/chat.c:230
+#: src/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
 msgstr "Neveljavno ime stre転nika"
 
@@ -5861,7 +6476,8 @@
 msgid "%s is not a valid room handle"
 msgstr "%s ni veljavna ro�ica sobe"
 
-#: src/protocols/jabber/chat.c:236 src/protocols/jabber/chat.c:237
+#: src/protocols/jabber/chat.c:236
+#: src/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
 msgstr "Neveljavna ro�ica sobe"
 
@@ -5869,7 +6485,8 @@
 msgid "Configuration error"
 msgstr "Napaka pri nastavitvi"
 
-#: src/protocols/jabber/chat.c:404 src/protocols/jabber/chat.c:549
+#: src/protocols/jabber/chat.c:404
+#: src/protocols/jabber/chat.c:549
 msgid "Unable to configure"
 msgstr "Ni mogo�e nastaviti"
 
@@ -5881,7 +6498,8 @@
 msgid "This room is not capable of being configured"
 msgstr "Te sobe se ne da nastavljati"
 
-#: src/protocols/jabber/chat.c:471 src/protocols/jabber/chat.c:540
+#: src/protocols/jabber/chat.c:471
+#: src/protocols/jabber/chat.c:540
 msgid "Registration error"
 msgstr "Napaka pri registraciji"
 
@@ -5889,8 +6507,9 @@
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "Spreminjanje vzdevka v pogovornih sobah ne-MUC ni podprto"
 
-#: src/protocols/jabber/chat.c:678 src/protocols/jabber/chat.c:689
-#: src/protocols/silc/ops.c:1235
+#: src/protocols/jabber/chat.c:678
+#: src/protocols/jabber/chat.c:689
+#: src/protocols/silc/ops.c:1449
 msgid "Error retrieving room list"
 msgstr "Napaka pri pridobivanju sezama sob"
 
@@ -5918,15 +6537,18 @@
 msgid "Write error"
 msgstr "Napaka pri pisanju"
 
-#: src/protocols/jabber/jabber.c:253 src/protocols/jabber/jabber.c:273
+#: src/protocols/jabber/jabber.c:253
+#: src/protocols/jabber/jabber.c:273
 msgid "Read Error"
 msgstr "Napaka pri branju"
 
-#: src/protocols/jabber/jabber.c:359 src/protocols/jabber/jabber.c:780
+#: src/protocols/jabber/jabber.c:359
+#: src/protocols/jabber/jabber.c:780
 msgid "Unable to create socket"
 msgstr "Ni mogo�e ustvariti vti�nika"
 
-#: src/protocols/jabber/jabber.c:403 src/protocols/jabber/jabber.c:740
+#: src/protocols/jabber/jabber.c:403
+#: src/protocols/jabber/jabber.c:740
 msgid "Invalid Jabber ID"
 msgstr "Neveljaven Jabber ID"
 
@@ -5935,19 +6557,23 @@
 msgid "Registration of %s@%s successful"
 msgstr "Registracija %s@%s uspela!"
 
-#: src/protocols/jabber/jabber.c:475 src/protocols/jabber/jabber.c:476
+#: src/protocols/jabber/jabber.c:475
+#: src/protocols/jabber/jabber.c:476
 msgid "Registration Successful"
 msgstr "Registracija uspela!"
 
-#: src/protocols/jabber/jabber.c:482 src/protocols/jabber/jabber.c:1299
+#: src/protocols/jabber/jabber.c:482
+#: src/protocols/jabber/jabber.c:1299
 msgid "Unknown Error"
 msgstr "Neznana napaka"
 
-#: src/protocols/jabber/jabber.c:484 src/protocols/jabber/jabber.c:485
+#: src/protocols/jabber/jabber.c:484
+#: src/protocols/jabber/jabber.c:485
 msgid "Registration Failed"
 msgstr "Napaka pri registraciji"
 
-#: src/protocols/jabber/jabber.c:596 src/protocols/jabber/jabber.c:597
+#: src/protocols/jabber/jabber.c:596
+#: src/protocols/jabber/jabber.c:597
 msgid "Already Registered"
 msgstr "貼e registriran"
 
@@ -5955,13 +6581,16 @@
 msgid "E-Mail"
 msgstr "E-po邸ta"
 
-#: src/protocols/jabber/jabber.c:673 src/protocols/oscar/oscar.c:6007
-#: src/protocols/oscar/oscar.c:6015
+#: src/protocols/jabber/jabber.c:673
+#: src/protocols/oscar/oscar.c:6056
+#: src/protocols/oscar/oscar.c:6064
 msgid "State"
 msgstr "Zvezna dr転ava"
 
-#: src/protocols/jabber/jabber.c:683 src/protocols/silc/ops.c:855
-#: src/protocols/silc/silc.c:663 src/protocols/silc/util.c:513
+#: src/protocols/jabber/jabber.c:683
+#: src/protocols/silc/ops.c:1069
+#: src/protocols/silc/silc.c:687
+#: src/protocols/silc/util.c:514
 msgid "Phone"
 msgstr "Telefon"
 
@@ -5973,7 +6602,8 @@
 msgid "Please fill out the information below to register your new account."
 msgstr "Za registracijo novega ra�una morate izpolniti spodnja polja."
 
-#: src/protocols/jabber/jabber.c:704 src/protocols/jabber/jabber.c:705
+#: src/protocols/jabber/jabber.c:704
+#: src/protocols/jabber/jabber.c:705
 msgid "Register New Jabber Account"
 msgstr "Registrirajte nov ra�un za Jabber"
 
@@ -5981,7 +6611,8 @@
 msgid "Initializing Stream"
 msgstr "Inicializacija toka"
 
-#: src/protocols/jabber/jabber.c:848 src/protocols/msn/session.c:368
+#: src/protocols/jabber/jabber.c:848
+#: src/protocols/msn/session.c:355
 msgid "Authenticating"
 msgstr "Overovljanje"
 
@@ -5989,9 +6620,12 @@
 msgid "Re-initializing Stream"
 msgstr "Ponovna inicializacija toka"
 
-#: src/protocols/jabber/jabber.c:928 src/protocols/jabber/jabber.c:1277
-#: src/protocols/jabber/jabber.c:1318 src/protocols/jabber/jabber.c:1351
-#: src/protocols/oscar/oscar.c:767 src/protocols/oscar/oscar.c:7589
+#: src/protocols/jabber/jabber.c:928
+#: src/protocols/jabber/jabber.c:1277
+#: src/protocols/jabber/jabber.c:1318
+#: src/protocols/jabber/jabber.c:1351
+#: src/protocols/oscar/oscar.c:769
+#: src/protocols/oscar/oscar.c:7623
 msgid "Not Authorized"
 msgstr "Nepoobla邸�eno"
 
@@ -6015,16 +6649,14 @@
 msgid "None (To pending)"
 msgstr "Brez (Za �akajo�e)"
 
-#: src/protocols/jabber/jabber.c:982 src/protocols/yahoo/yahoo.c:2780
-msgid "None"
-msgstr "brez"
-
 #: src/protocols/jabber/jabber.c:984
 msgid "Subscription"
 msgstr "Naro�ilo"
 
-#: src/protocols/jabber/jabber.c:1039 src/protocols/jabber/jabber.c:1047
-#: src/protocols/jabber/jabber.c:1055 src/protocols/jabber/jabber.c:1063
+#: src/protocols/jabber/jabber.c:1039
+#: src/protocols/jabber/jabber.c:1047
+#: src/protocols/jabber/jabber.c:1055
+#: src/protocols/jabber/jabber.c:1063
 #: src/protocols/jabber/jabber.c:1071
 msgid "Priority"
 msgstr "Prednost stika"
@@ -6037,7 +6669,8 @@
 msgid "Your password has been changed."
 msgstr "Va邸e geslo je bilo spremenjeno."
 
-#: src/protocols/jabber/jabber.c:1098 src/protocols/jabber/jabber.c:1099
+#: src/protocols/jabber/jabber.c:1098
+#: src/protocols/jabber/jabber.c:1099
 msgid "Error changing password"
 msgstr "Napaka pri spreminjanju gesla"
 
@@ -6045,7 +6678,8 @@
 msgid "Password (again)"
 msgstr "Novo geslo (ponovno)"
 
-#: src/protocols/jabber/jabber.c:1160 src/protocols/jabber/jabber.c:1161
+#: src/protocols/jabber/jabber.c:1160
+#: src/protocols/jabber/jabber.c:1161
 msgid "Change Jabber Password"
 msgstr "Spremeni geslo za Jabber"
 
@@ -6053,20 +6687,21 @@
 msgid "Please enter your new password"
 msgstr "Vnesite svoje novo geslo"
 
-#: src/protocols/jabber/jabber.c:1171 src/protocols/toc/toc.c:1684
+#: src/protocols/jabber/jabber.c:1171
+#: src/protocols/toc/toc.c:1684
 msgid "Set User Info"
 msgstr "Nastavi informacije o uporabniku"
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/jabber/jabber.c:1176 src/protocols/toc/toc.c:1694
+#: src/protocols/jabber/jabber.c:1176
+#: src/protocols/toc/toc.c:1694
 msgid "Change Password"
 msgstr "Spremeni geslo"
 
 #. }
 #: src/protocols/jabber/jabber.c:1181
-#, fuzzy
 msgid "Search for users"
-msgstr "_I邸�i:"
+msgstr "I邸�i uporabnike"
 
 #: src/protocols/jabber/jabber.c:1257
 msgid "Bad Request"
@@ -6088,7 +6723,8 @@
 msgid "Gone"
 msgstr "Ni na voljo"
 
-#: src/protocols/jabber/jabber.c:1267 src/protocols/jabber/jabber.c:1341
+#: src/protocols/jabber/jabber.c:1267
+#: src/protocols/jabber/jabber.c:1341
 msgid "Internal Server Error"
 msgstr "Notranja napaka stre転nika"
 
@@ -6184,7 +6820,8 @@
 msgid "Resource Conflict"
 msgstr "Spor vira"
 
-#: src/protocols/jabber/jabber.c:1333 src/protocols/silc/ops.c:1514
+#: src/protocols/jabber/jabber.c:1333
+#: src/protocols/silc/ops.c:1728
 msgid "Connection Timeout"
 msgstr "�asovna omejitev povezave potekla"
 
@@ -6309,12 +6946,8 @@
 msgstr "ban &lt;uporabnik&gt; [soba]:  Prepovej uporabnika v sobi."
 
 #: src/protocols/jabber/jabber.c:1583
-msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
-msgstr ""
-"affiliate &lt;uporabnik&gt; &lt;lastnik|upravitelj|�lan|izlo�enec|nih�e&gt;: "
-"Nastavitev uporabnikovega statusa v sobi."
+msgid "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's affiliation with the room."
+msgstr "affiliate &lt;uporabnik&gt; &lt;lastnik|skrbnik|�lan|izlo�enec|nih�e&gt;: Nastavitev uporabnikovega statusa v sobi."
 
 #: src/protocols/jabber/jabber.c:1589
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
@@ -6329,11 +6962,8 @@
 msgstr "kick &lt;uporabnik&gt; [soba]:  Brcni uporabnika iz sobe."
 
 #: src/protocols/jabber/jabber.c:1606
-msgid ""
-"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
-msgstr ""
-"msg &lt;uporabnik&gt; &lt;sporo�ilo&gt;:  Po邸ljite zasebno sporo�ilo drugemu "
-"uporabniku."
+msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+msgstr "msg &lt;uporabnik&gt; &lt;sporo�ilo&gt;:  Po邸ljite zasebno sporo�ilo drugemu uporabniku."
 
 #. *< type
 #. *< ui_requirement
@@ -6345,32 +6975,34 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1686 src/protocols/jabber/jabber.c:1688
+#: src/protocols/jabber/jabber.c:1688
+#: src/protocols/jabber/jabber.c:1690
 msgid "Jabber Protocol Plugin"
 msgstr "Dodatek za protokol Jabber"
 
-#: src/protocols/jabber/jabber.c:1714
+#: src/protocols/jabber/jabber.c:1716
 msgid "Use TLS if available"
 msgstr "Uporabite TLS, �e je na voljo"
 
-#: src/protocols/jabber/jabber.c:1719
+#: src/protocols/jabber/jabber.c:1721
 msgid "Require TLS"
 msgstr "Zahtevaj TLS"
 
-#: src/protocols/jabber/jabber.c:1722
+#: src/protocols/jabber/jabber.c:1724
 msgid "Force old (port 5223) SSL"
 msgstr "Vsili star SSL (vrata 5223)"
 
-#: src/protocols/jabber/jabber.c:1727
+#: src/protocols/jabber/jabber.c:1729
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Dovoli overovitev z navadnim besedilom preko ne邸ifriranih toka"
 
-#: src/protocols/jabber/jabber.c:1732
+#: src/protocols/jabber/jabber.c:1734
 msgid "Connect port"
 msgstr "Pove転i vrata"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1736 src/protocols/silc/silc.c:1593
+#: src/protocols/jabber/jabber.c:1738
+#: src/protocols/silc/silc.c:1822
 msgid "Connect server"
 msgstr "Pove転i se na stre転nik"
 
@@ -6411,34 +7043,36 @@
 msgid "Unknown Error in presence"
 msgstr "Pri邸lo je do neznane napake"
 
-#: src/protocols/jabber/presence.c:289 src/protocols/msn/userlist.c:93
+#: src/protocols/jabber/presence.c:289
+#: src/protocols/msn/userlist.c:93
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list."
 msgstr "Uporabnik %s 転eli dodati %s na svoj seznam prijateljev."
 
-#: src/protocols/jabber/presence.c:297 src/protocols/msn/userlist.c:100
-#: src/protocols/oscar/oscar.c:4602 src/protocols/oscar/oscar.c:7248
-#: src/protocols/yahoo/yahoo.c:895
+#: src/protocols/jabber/presence.c:297
+#: src/protocols/msn/userlist.c:100
+#: src/protocols/oscar/oscar.c:4604
+#: src/protocols/oscar/oscar.c:7274
+#: src/protocols/yahoo/yahoo.c:902
 msgid "Authorize"
 msgstr "Pooblasti"
 
-#: src/protocols/jabber/presence.c:298 src/protocols/msn/userlist.c:101
-#: src/protocols/oscar/oscar.c:4604 src/protocols/oscar/oscar.c:7249
-#: src/protocols/yahoo/yahoo.c:897
+#: src/protocols/jabber/presence.c:298
+#: src/protocols/msn/userlist.c:101
+#: src/protocols/oscar/oscar.c:4606
+#: src/protocols/oscar/oscar.c:7275
+#: src/protocols/yahoo/yahoo.c:904
 msgid "Deny"
 msgstr "Zavrni"
 
-#: src/protocols/jabber/presence.c:345 src/protocols/jabber/presence.c:346
+#: src/protocols/jabber/presence.c:345
+#: src/protocols/jabber/presence.c:346
 msgid "Create New Room"
 msgstr "Ustvari novo sobo"
 
 #: src/protocols/jabber/presence.c:347
-msgid ""
-"You are creating a new room.  Would you like to configure it, or accept the "
-"default settings?"
-msgstr ""
-"Ustvarili boste novo sobo. Jo 転elite najprej nastaviti ali boste sprejeli "
-"privzete nastavitve?"
+msgid "You are creating a new room.  Would you like to configure it, or accept the default settings?"
+msgstr "Ustvarili boste novo sobo. Jo 転elite najprej nastaviti ali boste sprejeli privzete nastavitve?"
 
 #: src/protocols/jabber/presence.c:349
 msgid "Configure Room"
@@ -6461,10 +7095,10 @@
 #: src/protocols/jabber/si.c:591
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
-msgstr ""
-"Ni mogo�e poslati datoteke %s, ker uporabnik ne podpira prenosov datotek"
-
-#: src/protocols/jabber/si.c:592 src/protocols/jabber/si.c:593
+msgstr "Ni mogo�e poslati datoteke %s, ker uporabnik ne podpira prenosov datotek"
+
+#: src/protocols/jabber/si.c:592
+#: src/protocols/jabber/si.c:593
 msgid "File Send Failed"
 msgstr "Po邸iljanje datoteke ni uspelo"
 
@@ -6475,21 +7109,13 @@
 
 #: src/protocols/msn/dialog.c:97
 #, c-format
-msgid ""
-"%s on the local list is inside the group \"%s\" but not on the server list. "
-"Do you want this buddy to be added?"
-msgstr ""
-"%s z lokalnega seznama je v skupini \"%s\", ne pa tudi na seznamu stre転nika. "
-"貼elite dodati tega prijatelja v skupino?"
+msgid "%s on the local list is inside the group \"%s\" but not on the server list. Do you want this buddy to be added?"
+msgstr "%s z lokalnega seznama je v skupini \"%s\", ne pa tudi na seznamu stre転nika. 貼elite dodati tega prijatelja v skupino?"
 
 #: src/protocols/msn/dialog.c:105
 #, c-format
-msgid ""
-"%s is on the local list but not on the server list. Do you want this buddy "
-"to be added?"
-msgstr ""
-"%s je na lokalnem seznamu, ne pa tudi na seznamu stre転nika. 貼elite dodati "
-"tega prijatelja?"
+msgid "%s is on the local list but not on the server list. Do you want this buddy to be added?"
+msgstr "%s je na lokalnem seznamu, ne pa tudi na seznamu stre転nika. 貼elite dodati tega prijatelja?"
 
 #: src/protocols/msn/error.c:35
 msgid "Unable to parse message"
@@ -6535,7 +7161,8 @@
 msgid "Not on list"
 msgstr "Ni na seznamu"
 
-#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:690
+#: src/protocols/msn/error.c:70
+#: src/protocols/zephyr/zephyr.c:690
 msgid "User is offline"
 msgstr "Uporabnik ni na zvezi"
 
@@ -6587,7 +7214,8 @@
 msgid "Too many hits to a FND"
 msgstr "Preve� zadetkov za FND"
 
-#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:206
+#: src/protocols/msn/error.c:112
+#: src/protocols/oscar/oscar.c:206
 msgid "Not logged in"
 msgstr "Neprijavljen"
 
@@ -6619,7 +7247,8 @@
 msgid "Server busy"
 msgstr "Stre転nik je zaposlen"
 
-#: src/protocols/msn/error.c:138 src/protocols/msn/error.c:151
+#: src/protocols/msn/error.c:138
+#: src/protocols/msn/error.c:151
 #: src/protocols/msn/error.c:206
 msgid "Server unavailable"
 msgstr "Stre転nik je nedostopen"
@@ -6680,8 +7309,10 @@
 msgid "Server too busy"
 msgstr "Stre転nik preve� zaposlen"
 
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2756
-#: src/protocols/silc/ops.c:1503 src/protocols/toc/toc.c:722
+#: src/protocols/msn/error.c:198
+#: src/protocols/oscar/oscar.c:2765
+#: src/protocols/silc/ops.c:1717
+#: src/protocols/toc/toc.c:722
 msgid "Authentication failed"
 msgstr "Overovitev ni uspela"
 
@@ -6748,12 +7379,8 @@
 msgstr "Dovoli MSN strani za mobilnike?"
 
 #: src/protocols/msn/msn.c:307
-msgid ""
-"Do you want to allow or disallow people on your buddy list to send you MSN "
-"Mobile pages to your cell phone or other mobile device?"
-msgstr ""
-"Ali 転elite dovoliti oz. prepovedati prijateljem na va邸em seznamu, da vam "
-"po邸iljajo MSN strani za mobilnike na va邸 mobilni telefon?"
+msgid "Do you want to allow or disallow people on your buddy list to send you MSN Mobile pages to your cell phone or other mobile device?"
+msgstr "Ali 転elite dovoliti oz. prepovedati prijateljem na va邸em seznamu, da vam po邸iljajo MSN strani za mobilnike na va邸 mobilni telefon?"
 
 #: src/protocols/msn/msn.c:311
 msgid "Allow"
@@ -6775,9 +7402,11 @@
 msgid "Page"
 msgstr "Stran/Poziv"
 
-#: src/protocols/msn/msn.c:544 src/protocols/msn/msn.c:551
-#: src/protocols/msn/msn.c:554 src/protocols/yahoo/yahoo.c:2787
-#: src/protocols/yahoo/yahoo.c:2793
+#: src/protocols/msn/msn.c:552
+#: src/protocols/msn/msn.c:559
+#: src/protocols/msn/msn.c:562
+#: src/protocols/yahoo/yahoo.c:2804
+#: src/protocols/yahoo/yahoo.c:2810
 #, c-format
 msgid ""
 "\n"
@@ -6786,174 +7415,181 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: src/protocols/msn/msn.c:551
+#: src/protocols/msn/msn.c:559
 msgid "Has you"
 msgstr "Vas ima med prijatelji"
 
-#: src/protocols/msn/msn.c:581 src/protocols/msn/state.c:33
-#: src/protocols/yahoo/yahoo.c:2615 src/protocols/yahoo/yahoo.c:3230
+#: src/protocols/msn/msn.c:589
+#: src/protocols/msn/state.c:33
+#: src/protocols/yahoo/yahoo.c:2635
+#: src/protocols/yahoo/yahoo.c:3212
 msgid "Be Right Back"
 msgstr "Pridem precej nazaj"
 
-#: src/protocols/msn/msn.c:589 src/protocols/msn/state.c:35
-#: src/protocols/yahoo/yahoo.c:2625 src/protocols/yahoo/yahoo.c:3245
+#: src/protocols/msn/msn.c:597
+#: src/protocols/msn/state.c:35
+#: src/protocols/yahoo/yahoo.c:2645
+#: src/protocols/yahoo/yahoo.c:3227
 msgid "On The Phone"
 msgstr "Na telefonu"
 
-#: src/protocols/msn/msn.c:593 src/protocols/msn/state.c:36
-#: src/protocols/yahoo/yahoo.c:2629 src/protocols/yahoo/yahoo.c:3251
+#: src/protocols/msn/msn.c:601
+#: src/protocols/msn/state.c:36
+#: src/protocols/yahoo/yahoo.c:2649
+#: src/protocols/yahoo/yahoo.c:3233
 msgid "Out To Lunch"
 msgstr "Na kosilu"
 
-#: src/protocols/msn/msn.c:597 src/protocols/zephyr/zephyr.c:2255
-#: src/status.c:157
+#: src/protocols/msn/msn.c:605
+#: src/protocols/zephyr/zephyr.c:2255
+#: src/status.c:156
 msgid "Hidden"
 msgstr "Skrito"
 
-#: src/protocols/msn/msn.c:613
+#: src/protocols/msn/msn.c:621
 msgid "Set Friendly Name"
 msgstr "Nastavi poimenovanje"
 
-#: src/protocols/msn/msn.c:618
-msgid "Set Home Phone Number"
-msgstr "Nastavi 邸t. doma�ega telefona"
-
-#: src/protocols/msn/msn.c:622
-msgid "Set Work Phone Number"
-msgstr "Nastavi 邸t. slu転benega telefona"
-
 #: src/protocols/msn/msn.c:626
+msgid "Set Home Phone Number"
+msgstr "Nastavi 邸t. doma�ega telefona"
+
+#: src/protocols/msn/msn.c:630
+msgid "Set Work Phone Number"
+msgstr "Nastavi 邸t. slu転benega telefona"
+
+#: src/protocols/msn/msn.c:634
 msgid "Set Mobile Phone Number"
 msgstr "Nastavi 邸t. mobilnega telefona"
 
-#: src/protocols/msn/msn.c:632
+#: src/protocols/msn/msn.c:640
 msgid "Enable/Disable Mobile Devices"
 msgstr "Omogo�i/onemogo�i mobilne naprave"
 
-#: src/protocols/msn/msn.c:637
+#: src/protocols/msn/msn.c:645
 msgid "Allow/Disallow Mobile Pages"
 msgstr "Dovoli/prepovej mobilne strani"
 
-#: src/protocols/msn/msn.c:647
+#: src/protocols/msn/msn.c:655
 msgid "Open Hotmail Inbox"
 msgstr "Odpri prispelo po邸to Hotmail"
 
-#: src/protocols/msn/msn.c:671
+#: src/protocols/msn/msn.c:679
 msgid "Send to Mobile"
 msgstr "Po邸lji na mobilca"
 
-#: src/protocols/msn/msn.c:680 src/protocols/novell/novell.c:3442
+#: src/protocols/msn/msn.c:688
+#: src/protocols/novell/novell.c:3446
 msgid "Initiate _Chat"
 msgstr "Za�ni _pogovor"
 
-#: src/protocols/msn/msn.c:717
-msgid ""
-"SSL support is needed for MSN. Please install a supported SSL library. See "
-"http://gaim.sf.net/faq-ssl.php for more information."
-msgstr ""
-"Za MSN potrebujete podporo SSL, zato morate namestiti podprto knji転nico SSL. "
-"Ve� informacij na http://gaim.sf.net/faq-ssl.php."
-
-#: src/protocols/msn/msn.c:745
+#: src/protocols/msn/msn.c:725
+msgid "SSL support is needed for MSN. Please install a supported SSL library. See http://gaim.sf.net/faq-ssl.php for more information."
+msgstr "Za MSN potrebujete podporo SSL, zato morate namestiti podprto knji転nico SSL. Ve� informacij na http://gaim.sf.net/faq-ssl.php."
+
+#: src/protocols/msn/msn.c:753
 msgid "Failed to connect to server."
 msgstr "Povezava na stre転nik neuspe邸na."
 
-#: src/protocols/msn/msn.c:1387 src/protocols/yahoo/yahoo_profile.c:654
-#: src/protocols/zephyr/zephyr.c:721 src/protocols/zephyr/zephyr.c:1135
+#: src/protocols/msn/msn.c:1379
+#: src/protocols/yahoo/yahoo_profile.c:654
+#: src/protocols/zephyr/zephyr.c:721
+#: src/protocols/zephyr/zephyr.c:1135
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>Psevdonim:</b> %s<br>"
 
 #. put a link to the actual profile URL
-#: src/protocols/msn/msn.c:1394 src/protocols/msn/msn.c:1740
-#: src/protocols/yahoo/yahoo_profile.c:1167 src/util.c:801
+#: src/protocols/msn/msn.c:1386
+#: src/protocols/msn/msn.c:1732
+#: src/protocols/yahoo/yahoo_profile.c:1167
+#: src/util.c:800
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b> "
 
-#: src/protocols/msn/msn.c:1471
+#: src/protocols/msn/msn.c:1463
 msgid "MSN Profile"
 msgstr "Profil MSN"
 
-#: src/protocols/msn/msn.c:1476 src/protocols/msn/msn.c:1727
+#: src/protocols/msn/msn.c:1468
+#: src/protocols/msn/msn.c:1719
 #: src/protocols/yahoo/yahoo_profile.c:760
 msgid "Error retrieving profile"
 msgstr "Napaka pri pridobivanju profila"
 
-#: src/protocols/msn/msn.c:1546 src/protocols/oscar/oscar.c:5992
+#: src/protocols/msn/msn.c:1538
+#: src/protocols/oscar/oscar.c:6041
 #: src/protocols/yahoo/yahoo_profile.c:1015
 msgid "Age"
 msgstr "Starost"
 
-#: src/protocols/msn/msn.c:1553 src/protocols/oscar/oscar.c:5979
-#: src/protocols/yahoo/yahoo_profile.c:1025
-msgid "Gender"
-msgstr "Spol"
-
-#: src/protocols/msn/msn.c:1562 src/protocols/yahoo/yahoo_profile.c:1020
+#: src/protocols/msn/msn.c:1554
+#: src/protocols/yahoo/yahoo_profile.c:1020
 msgid "Marital Status"
 msgstr "Zakonski stan"
 
-#: src/protocols/msn/msn.c:1569 src/protocols/novell/novell.c:1454
+#: src/protocols/msn/msn.c:1561
+#: src/protocols/novell/novell.c:1482
 #: src/protocols/yahoo/yahoo_profile.c:1010
 msgid "Location"
 msgstr "Lokacija"
 
-#: src/protocols/msn/msn.c:1577 src/protocols/yahoo/yahoo_profile.c:1030
+#: src/protocols/msn/msn.c:1569
+#: src/protocols/yahoo/yahoo_profile.c:1030
 msgid "Occupation"
 msgstr "Zaposlitev"
 
-#: src/protocols/msn/msn.c:1594 src/protocols/msn/msn.c:1600
-#: src/protocols/msn/msn.c:1607 src/protocols/msn/msn.c:1615
-#: src/protocols/msn/msn.c:1622
+#: src/protocols/msn/msn.c:1586
+#: src/protocols/msn/msn.c:1592
+#: src/protocols/msn/msn.c:1599
+#: src/protocols/msn/msn.c:1607
+#: src/protocols/msn/msn.c:1614
 msgid "A Little About Me"
 msgstr "Nekaj o meni"
 
-#: src/protocols/msn/msn.c:1631 src/protocols/msn/msn.c:1637
-#: src/protocols/msn/msn.c:1644 src/protocols/msn/msn.c:1651
+#: src/protocols/msn/msn.c:1623
+#: src/protocols/msn/msn.c:1629
+#: src/protocols/msn/msn.c:1636
+#: src/protocols/msn/msn.c:1643
 msgid "Favorite Things"
 msgstr "Priljubljene stvari"
 
-#: src/protocols/msn/msn.c:1660 src/protocols/msn/msn.c:1666
-#: src/protocols/msn/msn.c:1673
+#: src/protocols/msn/msn.c:1652
+#: src/protocols/msn/msn.c:1658
+#: src/protocols/msn/msn.c:1665
 msgid "Hobbies and Interests"
 msgstr "Hobiji in interesi"
 
-#: src/protocols/msn/msn.c:1682 src/protocols/msn/msn.c:1688
+#: src/protocols/msn/msn.c:1674
+#: src/protocols/msn/msn.c:1680
 #: src/protocols/yahoo/yahoo_profile.c:1072
 msgid "Favorite Quote"
 msgstr "Najljub邸i citat"
 
-#: src/protocols/msn/msn.c:1696
+#: src/protocols/msn/msn.c:1688
 msgid "Last Updated"
 msgstr "Nazadnje osve転eno"
 
-#: src/protocols/msn/msn.c:1707 src/protocols/silc/ops.c:846
+#: src/protocols/msn/msn.c:1699
+#: src/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "Doma�a stran"
 
-#: src/protocols/msn/msn.c:1729
+#: src/protocols/msn/msn.c:1721
 msgid "The user has not created a public profile."
 msgstr "Uporabnik ni ustvaril javnega profila."
 
-#: src/protocols/msn/msn.c:1730
-msgid ""
-"MSN reported not being able to find the user's profile. This either means "
-"that the user does not exist, or that the user exists but has not created a "
-"public profile."
-msgstr ""
-"MSN ne more najti uporabnikovega profila. To lahko pomeni, da uporabnik ne "
-"obstaja, ali pa 邸e ni ustvaril javnega profila."
-
-#: src/protocols/msn/msn.c:1734
-msgid ""
-"Gaim could not find any information in the user's profile. The user most "
-"likely does not exist."
-msgstr ""
-"Gaim v uporabnikovem profilu ne more najti informacij. Uporabnik verjetno ne "
-"obstaja."
-
-#: src/protocols/msn/msn.c:1740 src/protocols/yahoo/yahoo_profile.c:1167
+#: src/protocols/msn/msn.c:1722
+msgid "MSN reported not being able to find the user's profile. This either means that the user does not exist, or that the user exists but has not created a public profile."
+msgstr "MSN ne more najti uporabnikovega profila. To lahko pomeni, da uporabnik ne obstaja, ali pa 邸e ni ustvaril javnega profila."
+
+#: src/protocols/msn/msn.c:1726
+msgid "Gaim could not find any information in the user's profile. The user most likely does not exist."
+msgstr "Gaim v uporabnikovem profilu ne more najti informacij. Uporabnik verjetno ne obstaja."
+
+#: src/protocols/msn/msn.c:1732
+#: src/protocols/yahoo/yahoo_profile.c:1167
 msgid "Profile URL"
 msgstr "URL profila"
 
@@ -6967,23 +7603,25 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1942 src/protocols/msn/msn.c:1944
+#: src/protocols/msn/msn.c:1935
+#: src/protocols/msn/msn.c:1937
 msgid "MSN Protocol Plugin"
 msgstr "Vti�nik za protokol MSN"
 
-#: src/protocols/msn/msn.c:1963
+#: src/protocols/msn/msn.c:1956
 msgid "Login server"
 msgstr "Prijavni stre転nik"
 
-#: src/protocols/msn/msn.c:1972
+#: src/protocols/msn/msn.c:1965
 msgid "Use HTTP Method"
 msgstr "Uporabi metodo HTTP"
 
-#: src/protocols/msn/msn.c:1980
+#: src/protocols/msn/msn.c:1973
 msgid "nudge: nudge a contact to get their attention"
 msgstr "nudge: Pome転iknite prijatelju, da vas bo opazil"
 
-#: src/protocols/msn/nexus.c:103 src/protocols/msn/servconn.c:127
+#: src/protocols/msn/nexus.c:103
+#: src/protocols/msn/servconn.c:127
 #: src/protocols/yahoo/yahoochat.c:1326
 msgid "Unable to connect"
 msgstr "Ni se mogo�e povezati"
@@ -6993,8 +7631,9 @@
 msgid "%s is not a valid group."
 msgstr "%s ni veljavna skupina."
 
-#: src/protocols/msn/notification.c:184 src/protocols/msn/notification.c:528
-#: src/protocols/msn/session.c:347
+#: src/protocols/msn/notification.c:184
+#: src/protocols/msn/notification.c:532
+#: src/protocols/msn/session.c:334
 msgid "Unknown error."
 msgstr "Neznana napaka."
 
@@ -7028,48 +7667,42 @@
 msgid "%s is not a valid passport account."
 msgstr "%s ni veljaven ra�un potnega lista."
 
-#: src/protocols/msn/notification.c:815
+#: src/protocols/msn/notification.c:528
+msgid "Service Temporarily Unavailable."
+msgstr "Storitev je trenutno nedosegljiva."
+
+#: src/protocols/msn/notification.c:821
 msgid "Unable to rename group"
 msgstr "Skupine ni mogo�e preimenovati"
 
-#: src/protocols/msn/notification.c:870
+#: src/protocols/msn/notification.c:876
 msgid "Unable to delete group"
 msgstr "Skupine ni mogo�e izbrisati"
 
-#: src/protocols/msn/notification.c:1303
+#: src/protocols/msn/notification.c:1309
 #, c-format
 msgid ""
-"The MSN server will shut down for maintenance in %d minute. You will "
-"automatically be signed out at that time.  Please finish any conversations "
-"in progress.\n"
+"The MSN server will shut down for maintenance in %d minute. You will automatically be signed out at that time.  Please finish any conversations in progress.\n"
 "\n"
-"After the maintenance has been completed, you will be able to successfully "
-"sign in."
+"After the maintenance has been completed, you will be able to successfully sign in."
 msgid_plural ""
-"The MSN server will shut down for maintenance in %d minutes. You will "
-"automatically be signed out at that time.  Please finish any conversations "
-"in progress.\n"
+"The MSN server will shut down for maintenance in %d minutes. You will automatically be signed out at that time.  Please finish any conversations in progress.\n"
 "\n"
-"After the maintenance has been completed, you will be able to successfully "
-"sign in."
+"After the maintenance has been completed, you will be able to successfully sign in."
 msgstr[0] ""
-"Stre転nik MSN se bo izklju�il zaradi vzdr転evalnih del v %d minutah. Ob tem "
-"boste samodejno odjavljeni.  Prosimo zaklju�ite vse pogovore, ki so v teku.\n"
+"Stre転nik MSN se bo izklju�il zaradi vzdr転evalnih del v %d minutah. Ob tem boste samodejno odjavljeni.  Prosimo zaklju�ite vse pogovore, ki so v teku.\n"
 "\n"
 "Po zaklju�enih vzdr転evalnih delih se boste lahko uspe邸no prijavili."
 msgstr[1] ""
-"Stre転nik MSN se bo izklju�il zaradi vzdr転evalnih del v %d minuti. Ob tem "
-"boste samodejno odjavljeni.  Prosimo zaklju�ite vse pogovore, ki so v teku.\n"
+"Stre転nik MSN se bo izklju�il zaradi vzdr転evalnih del v %d minuti. Ob tem boste samodejno odjavljeni.  Prosimo zaklju�ite vse pogovore, ki so v teku.\n"
 "\n"
 "Po zaklju�enih vzdr転evalnih delih se boste lahko uspe邸no prijavili."
 msgstr[2] ""
-"Stre転nik MSN se bo izklju�il zaradi vzdr転evalnih del v %d minutah. Ob tem "
-"boste samodejno odjavljeni.  Prosimo zaklju�ite vse pogovore, ki so v teku.\n"
+"Stre転nik MSN se bo izklju�il zaradi vzdr転evalnih del v %d minutah. Ob tem boste samodejno odjavljeni.  Prosimo zaklju�ite vse pogovore, ki so v teku.\n"
 "\n"
 "Po zaklju�enih vzdr転evalnih delih se boste lahko uspe邸no prijavili."
 msgstr[3] ""
-"Stre転nik MSN se bo izklju�il zaradi vzdr転evalnih del v %d minutah. Ob tem "
-"boste samodejno odjavljeni.  Prosimo zaklju�ite vse pogovore, ki so v teku.\n"
+"Stre転nik MSN se bo izklju�il zaradi vzdr転evalnih del v %d minutah. Ob tem boste samodejno odjavljeni.  Prosimo zaklju�ite vse pogovore, ki so v teku.\n"
 "\n"
 "Po zaklju�enih vzdr転evalnih delih se boste lahko uspe邸no prijavili."
 
@@ -7081,78 +7714,78 @@
 msgid "Reading error"
 msgstr "Napaka pri branju"
 
-#: src/protocols/msn/servconn.c:133 src/protocols/msn/session.c:339
-#: src/protocols/oscar/oscar.c:4925
+#: src/protocols/msn/servconn.c:133
+#: src/protocols/msn/session.c:326
+#: src/protocols/oscar/oscar.c:4927
 msgid "Unknown error"
 msgstr "Neznana napaka"
 
-#: src/protocols/msn/servconn.c:136
+#: src/protocols/msn/servconn.c:138
 #, c-format
 msgid ""
-"Connection error from %s server (%s):\n"
+"Connection error from %s server:\n"
 "%s"
 msgstr ""
-"Napaka povezave s stre転nika %s (%s):\n"
+"Napaka povezave s stre転nika %s:\n"
 "%s"
 
-#: src/protocols/msn/session.c:317
+#: src/protocols/msn/session.c:304
 msgid "Our protocol is not supported by the server."
 msgstr "Stre転nik ne podpira tega protokola."
 
-#: src/protocols/msn/session.c:321
+#: src/protocols/msn/session.c:308
 msgid "Error parsing HTTP."
 msgstr "Napaka pri parsanju HTTP."
 
 #. MSG_SERVER_GHOST
 #. Looks like someone logged in as us! =-O
-#: src/protocols/msn/session.c:325 src/protocols/napster/napster.c:450
-#: src/protocols/oscar/oscar.c:5629 src/protocols/yahoo/yahoo.c:194
+#: src/protocols/msn/session.c:312
+#: src/protocols/napster/napster.c:456
+#: src/protocols/oscar/oscar.c:5677
+#: src/protocols/yahoo/yahoo.c:194
 msgid "You have signed on from another location."
 msgstr "Prijavili ste se z druge lokacije."
 
-#: src/protocols/msn/session.c:328
+#: src/protocols/msn/session.c:315
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
-msgstr ""
-"Stre転niki MSN so trenutno nedostopni. Prosimo po�akajte in poskusite znova."
-
-#: src/protocols/msn/session.c:333
+msgstr "Stre転niki MSN so trenutno nedostopni. Prosimo po�akajte in poskusite znova."
+
+#: src/protocols/msn/session.c:320
 msgid "The MSN servers are going down temporarily."
 msgstr "Stre転niki MSN se bodo za�asno zaustavili."
 
 #  Data is assumed to be the destination sn
-#: src/protocols/msn/session.c:337
+#: src/protocols/msn/session.c:324
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Ni mo転no overoviti: %s"
 
-#: src/protocols/msn/session.c:342
-msgid ""
-"Your MSN buddy list is temporarily unavailable. Please wait and try again."
-msgstr ""
-"Va邸 seznam prijateljev MSN je trenutno nedostopen. Prosimo po�akajte in "
-"poskusite znova."
-
-#: src/protocols/msn/session.c:363 src/protocols/msn/session.c:365
+#: src/protocols/msn/session.c:329
+msgid "Your MSN buddy list is temporarily unavailable. Please wait and try again."
+msgstr "Va邸 seznam prijateljev MSN je trenutno nedostopen. Prosimo po�akajte in poskusite znova."
+
+#: src/protocols/msn/session.c:350
+#: src/protocols/msn/session.c:352
 msgid "Handshaking"
 msgstr "Rokovanje"
 
-#: src/protocols/msn/session.c:364
+#: src/protocols/msn/session.c:351
 msgid "Transferring"
 msgstr "Prenos je v teku"
 
-#: src/protocols/msn/session.c:366
+#: src/protocols/msn/session.c:353
 msgid "Starting authentication"
 msgstr "Pri�etek overovitve"
 
-#: src/protocols/msn/session.c:367
+#: src/protocols/msn/session.c:354
 msgid "Getting cookie"
 msgstr "Pridobivanje pi邸kotka"
 
-#: src/protocols/msn/session.c:369
+#: src/protocols/msn/session.c:356
 msgid "Sending cookie"
 msgstr "Po邸ljanje pi邸kotka"
 
-#: src/protocols/msn/session.c:370
+#: src/protocols/msn/session.c:357
 msgid "Retrieving buddy list"
 msgstr "Prejemanje seznama prijateljev"
 
@@ -7160,33 +7793,31 @@
 msgid "Away From Computer"
 msgstr "Stran od ra�unalnika"
 
-#: src/protocols/msn/switchboard.c:403
+#: src/protocols/msn/switchboard.c:407
 msgid "Message may have not been sent because a timeout occurred:"
-msgstr ""
-"Sporo�ila morda ni bilo poslano, ker je pri邸lo do �asovne prekora�itve:"
-
-#: src/protocols/msn/switchboard.c:411
+msgstr "Sporo�ila morda ni bilo poslano, ker je pri邸lo do �asovne prekora�itve:"
+
+#: src/protocols/msn/switchboard.c:415
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr "Sporo�ila ni mogo�e poslati, saj ni dovoljeno v nevidnem stanju:"
 
-#: src/protocols/msn/switchboard.c:415
-msgid "Message could not be sent because the user is offline:"
-msgstr "Sporo�ila ni mogo�e poslati, saj uporabnik ni na zvezi:"
-
 #: src/protocols/msn/switchboard.c:419
-msgid "Message could not be sent because a connection error occurred:"
-msgstr "Sporo�ilo ni bilo poslano, ker je pri邸lo do napake v povezavi:"
+msgid "Message could not be sent because the user is offline:"
+msgstr "Sporo�ila ni mogo�e poslati, saj uporabnik ni na zvezi:"
 
 #: src/protocols/msn/switchboard.c:423
-msgid ""
-"Message could not be sent because an error with the switchboard occurred:"
+msgid "Message could not be sent because a connection error occurred:"
+msgstr "Sporo�ilo ni bilo poslano, ker je pri邸lo do napake v povezavi:"
+
+#: src/protocols/msn/switchboard.c:427
+msgid "Message could not be sent because an error with the switchboard occurred:"
 msgstr "Sporo�ila ni bilo poslano, ker je pri邸lo do napake v stikalni plo邸�i:"
 
-#: src/protocols/msn/switchboard.c:431
+#: src/protocols/msn/switchboard.c:435
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Sporo�ila morda ni bilo poslano, ker je pri邸lo do neznane napake:"
 
-#: src/protocols/msn/switchboard.c:952
+#: src/protocols/msn/switchboard.c:956
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s vam je ravnokar poslal me転ik!"
@@ -7215,59 +7846,57 @@
 msgid "The screen name specified is invalid."
 msgstr "Navedeno zaslonsko ime ni veljavno."
 
-#: src/protocols/napster/napster.c:260
+#: src/protocols/napster/napster.c:266
 msgid "Unable to read header from server"
 msgstr "Ni bilo mogo�e prebrati glave sporo�ila, ki ga je poslal stre転nik"
 
-#: src/protocols/napster/napster.c:274
+#: src/protocols/napster/napster.c:280
 #, c-format
 msgid "Unable to read message from server: %s.  Command is %hd, length is %hd."
-msgstr ""
-"Ni mogo�e prebrati sporo�ila s stre転nika: %s.  Ukaz je %hd, dol転ina pa %hd."
-
-#: src/protocols/napster/napster.c:290
+msgstr "Ni mogo�e prebrati sporo�ila s stre転nika: %s.  Ukaz je %hd, dol転ina pa %hd."
+
+#: src/protocols/napster/napster.c:296
 msgid "Unknown server error."
 msgstr "Neznana napaka stre転nika."
 
-#: src/protocols/napster/napster.c:339
+#: src/protocols/napster/napster.c:345
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
 msgstr "uporabniki: %s, datoteke: %s, velikost: %sGB"
 
 #. MSG_SERVER_HOTLIST_ERROR
-#: src/protocols/napster/napster.c:350
+#: src/protocols/napster/napster.c:356
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
 msgstr "Ni bilo dodati \"%s\" na va邸 seznam Napster vro�e"
 
-#. MSG_SERVER_DISCONNECTING
-#. we have been kicked off =^(
-#: src/protocols/napster/napster.c:357
-msgid "You were disconnected from the server."
-msgstr "Povezava s stre転nikom je bila prekinjena."
-
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:414
+#: src/protocols/napster/napster.c:420
 #, c-format
 msgid "%s requested your information"
 msgstr "%s je zahteval tvoje informacije"
 
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:454
+#: src/protocols/napster/napster.c:460
 #, c-format
 msgid "%s requested a PING"
 msgstr "%s je zahteval PING"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/napster/napster.c:501 src/protocols/napster/napster.c:532
-#: src/protocols/toc/toc.c:172 src/protocols/yahoo/yahoo.c:2212
-#: src/protocols/yahoo/yahoo.c:2239 src/protocols/yahoo/yahoo.c:2302
+#: src/protocols/napster/napster.c:507
+#: src/protocols/napster/napster.c:538
+#: src/protocols/toc/toc.c:172
+#: src/protocols/yahoo/yahoo.c:2219
+#: src/protocols/yahoo/yahoo.c:2246
+#: src/protocols/yahoo/yahoo.c:2309
 #: src/protocols/yahoo/yahoo_filexfer.c:69
-#: src/protocols/yahoo/yahoo_filexfer.c:111 src/protocols/yahoo/ycht.c:481
+#: src/protocols/yahoo/yahoo_filexfer.c:111
+#: src/protocols/yahoo/ycht.c:481
 msgid "Unable to connect."
 msgstr "Ni se bilo mogo�e povezati."
 
-#: src/protocols/napster/napster.c:590 src/protocols/toc/toc.c:1367
+#: src/protocols/napster/napster.c:596
+#: src/protocols/toc/toc.c:1367
 msgid "_Group:"
 msgstr "_Skupina:"
 
@@ -7281,7 +7910,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:687 src/protocols/napster/napster.c:689
+#: src/protocols/napster/napster.c:694
+#: src/protocols/napster/napster.c:696
 msgid "NAPSTER Protocol Plugin"
 msgstr "Dodatek za protokol NAPSTER"
 
@@ -7339,7 +7969,7 @@
 
 #: src/protocols/novell/nmuser.c:1910
 msgid "Your system administrator has disabled this operation"
-msgstr "Va邸 sistemski nadzornik je to mo転nost onemogo�il"
+msgstr "Va邸 sistemski skrbnik je to mo転nost onemogo�il"
 
 #: src/protocols/novell/nmuser.c:1913
 msgid "The server is unavailable; try again later"
@@ -7366,9 +7996,7 @@
 msgstr "Ni mogo�e prepoznati gostitelja uporabni邸kega imena, ki ste ga vnesli"
 
 #: src/protocols/novell/nmuser.c:1932
-msgid ""
-"Your account has been disabled because too many invalid passwords were "
-"entered"
+msgid "Your account has been disabled because too many invalid passwords were entered"
 msgstr "Va邸 ra�un je bil onemogo�en, ker ste vnesli preve� napa�nih gesel"
 
 #: src/protocols/novell/nmuser.c:1935
@@ -7396,12 +8024,8 @@
 msgstr "Uporabnik vas je zavrnil"
 
 #: src/protocols/novell/nmuser.c:1954
-msgid ""
-"This evaluation version does not allow more than ten users to log in at one "
-"time"
-msgstr ""
-"Ta preskusna razli�ica ne dovoljuje prijave ve� kot desetim uporabnikom "
-"hkrati"
+msgid "This evaluation version does not allow more than ten users to log in at one time"
+msgstr "Ta preskusna razli�ica ne dovoljuje prijave ve� kot desetim uporabnikom hkrati"
 
 #: src/protocols/novell/nmuser.c:1957
 msgid "The user is either offline or you are blocked"
@@ -7412,123 +8036,118 @@
 msgid "Unknown error: 0x%X"
 msgstr "Neznana napaka: 0x%X"
 
-#: src/protocols/novell/novell.c:117
+#: src/protocols/novell/novell.c:124
 #, c-format
 msgid "Login failed (%s)."
 msgstr "Prijava spodletela (%s)."
 
-#: src/protocols/novell/novell.c:232
+#: src/protocols/novell/novell.c:247
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
-msgstr ""
-"Sporo�ila ni bilo mo� poslati. Ni mogo�e dobiti podrobnosti za uporabnika (%"
-"s)."
-
-#: src/protocols/novell/novell.c:381
+msgstr "Sporo�ila ni bilo mo� poslati. Ni mogo�e dobiti podrobnosti za uporabnika (%s)."
+
+#: src/protocols/novell/novell.c:396
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "Ni bilo mo� dodati %s na va邸 seznam prijateljev (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
-#: src/protocols/novell/novell.c:407
+#: src/protocols/novell/novell.c:422
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "Sporo�ila (%s) ni bilo mo� poslati."
 
-#: src/protocols/novell/novell.c:478 src/protocols/novell/novell.c:972
+#: src/protocols/novell/novell.c:493
+#: src/protocols/novell/novell.c:987
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Ni bilo mo� povabiti uporabnika (%s)."
 
-#: src/protocols/novell/novell.c:517
+#: src/protocols/novell/novell.c:532
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr "Sporo�ila ni bilo mo� poslati %s. Ni mogo�e ustvariti konference (%s)."
 
-#: src/protocols/novell/novell.c:522
+#: src/protocols/novell/novell.c:537
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "Sporo�ila ni bilo mo� poslati. Ni mogo�e ustvariti konference (%s)."
 
-#: src/protocols/novell/novell.c:569
-#, c-format
-msgid ""
-"Unable to move user %s to folder %s in the server side list. Error while "
-"creating folder (%s)."
-msgstr ""
-"Uporabnika %s ni bilo mo� premakniti v mapo %s na seznamu nedejavnih na "
-"stre転niku. Napaka pri usvarjanju mape (%s)."
-
-#: src/protocols/novell/novell.c:617
-#, c-format
-msgid ""
-"Unable to add %s to your buddy list. Error creating folder in server side "
-"list (%s)."
-msgstr ""
-"Ni bilo mo� dodati %s na va邸 seznam prijateljev. Napaka pri ustvarjanju mape "
-"na stre転niku (%s)."
-
-#: src/protocols/novell/novell.c:690
+#: src/protocols/novell/novell.c:584
+#, c-format
+msgid "Unable to move user %s to folder %s in the server side list. Error while creating folder (%s)."
+msgstr "Uporabnika %s ni bilo mo� premakniti v mapo %s na seznamu nedejavnih na stre転niku. Napaka pri usvarjanju mape (%s)."
+
+#: src/protocols/novell/novell.c:632
+#, c-format
+msgid "Unable to add %s to your buddy list. Error creating folder in server side list (%s)."
+msgstr "Ni bilo mo� dodati %s na va邸 seznam prijateljev. Napaka pri ustvarjanju mape na stre転niku (%s)."
+
+#: src/protocols/novell/novell.c:705
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "Ni mo� dobiti podrobnosti za uporabnika %s (%s)."
 
-#: src/protocols/novell/novell.c:736 src/protocols/novell/novell.c:882
+#: src/protocols/novell/novell.c:751
+#: src/protocols/novell/novell.c:897
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "Ni bilo mo� dodati uporabnika na seznam zasebnosti (%s)."
 
-#: src/protocols/novell/novell.c:783
+#: src/protocols/novell/novell.c:798
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "Ni bilo mo� dodati %s na seznam zavrnjenih (%s)."
 
-#: src/protocols/novell/novell.c:836
+#: src/protocols/novell/novell.c:851
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "Ni bilo mo� dodati %s na seznam dovoljenih (%s)."
 
-#: src/protocols/novell/novell.c:904
+#: src/protocols/novell/novell.c:919
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "Ni bilo mo� odstraniti %s s seznama zasebnosti (%s)."
 
-#: src/protocols/novell/novell.c:927 src/protocols/novell/novell.c:1628
+#: src/protocols/novell/novell.c:942
+#: src/protocols/novell/novell.c:1656
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "Ni mogo�e spremeniti stre転ni邸kih nastavitve zasebnosti (%s)."
 
-#: src/protocols/novell/novell.c:999
+#: src/protocols/novell/novell.c:1014
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Ni mogo�e ustvariti konference (%s)."
 
-#: src/protocols/novell/novell.c:1110 src/protocols/novell/novell.c:1667
+#: src/protocols/novell/novell.c:1125
+#: src/protocols/novell/novell.c:1695
 msgid "Error communicating with server. Closing connection."
 msgstr "Napaka pri komunikaciji s stre転nikom. Zapiranje povezave."
 
-#: src/protocols/novell/novell.c:1452
+#: src/protocols/novell/novell.c:1480
 msgid "Telephone Number"
 msgstr "Telefonska 邸tevilka"
 
-#: src/protocols/novell/novell.c:1456
+#: src/protocols/novell/novell.c:1484
 msgid "Department"
 msgstr "Oddelek"
 
-#: src/protocols/novell/novell.c:1458
+#: src/protocols/novell/novell.c:1486
 msgid "Personal Title"
 msgstr "Osebni naziv"
 
-#: src/protocols/novell/novell.c:1462
+#: src/protocols/novell/novell.c:1490
 msgid "Mailstop"
 msgstr "StojPo邸ta"
 
-#: src/protocols/novell/novell.c:1464 src/protocols/oscar/oscar.c:5965
-#: src/protocols/oscar/oscar.c:5972
+#: src/protocols/novell/novell.c:1492
+#: src/protocols/oscar/oscar.c:6014
+#: src/protocols/oscar/oscar.c:6021
 msgid "Email Address"
 msgstr "Elektronski naslov"
 
-#: src/protocols/novell/novell.c:1480
+#: src/protocols/novell/novell.c:1508
 msgid "User ID"
 msgstr "Uporabni邸ka 邸t."
 
@@ -7539,46 +8158,41 @@
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:1494
+#: src/protocols/novell/novell.c:1522
 msgid "Full name"
 msgstr "Polno ime"
 
-#: src/protocols/novell/novell.c:1618
+#: src/protocols/novell/novell.c:1646
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "Konferenca GroupWise %d"
 
-#: src/protocols/novell/novell.c:1643
+#: src/protocols/novell/novell.c:1671
 msgid "Unable to make SSL connection to server."
 msgstr "Ni se bilo mogo�e povezati na stre転nik preko SSL."
 
-#: src/protocols/novell/novell.c:1673
-#, c-format
-msgid "Error processing event or response (%s)."
-msgstr "Napaka pri obdelavi dogodka ali odgovora (%s)."
-
-#: src/protocols/novell/novell.c:1707
+#: src/protocols/novell/novell.c:1728
 msgid "Authenticating..."
 msgstr "Overovljanje ..."
 
-#: src/protocols/novell/novell.c:1719
+#: src/protocols/novell/novell.c:1740
 msgid "Unable to connect to server."
 msgstr "Ni se bilo mogo�e povezati na stre転nik."
 
-#: src/protocols/novell/novell.c:1722
+#: src/protocols/novell/novell.c:1743
 msgid "Waiting for response..."
 msgstr "�akanje odgovora ..."
 
-#: src/protocols/novell/novell.c:1857
+#: src/protocols/novell/novell.c:1878
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s je bil povabljen na ta pomenek."
 
-#: src/protocols/novell/novell.c:1885
+#: src/protocols/novell/novell.c:1906
 msgid "Invitation to Conversation"
 msgstr "Povabilo na pomenek"
 
-#: src/protocols/novell/novell.c:1886
+#: src/protocols/novell/novell.c:1907
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7589,42 +8203,37 @@
 "\n"
 "Poslano: %s"
 
-#: src/protocols/novell/novell.c:1888
+#: src/protocols/novell/novell.c:1909
 msgid "Would you like to join the conversation?"
 msgstr "Se 転elite pridru転iti pomenku?"
 
-#: src/protocols/novell/novell.c:1995
+#: src/protocols/novell/novell.c:2016
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "Ker ste se prijavili na drugi delovni postaji, ste bili odjavljeni."
 
-#: src/protocols/novell/novell.c:2051
-#, c-format
-msgid ""
-"%s appears to be offline and did not receive the message that you just sent."
+#: src/protocols/novell/novell.c:2072
+#, c-format
+msgid "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s ni na zvezi in ni sprejel sporo�ila, ki ste ga pravkar poslali."
 
 #. TODO: Would be nice to prompt if not set!
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:2149
-msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
-msgstr ""
-"Ni se mogo�e povezati na stre転nik. Vnesite naslov stre転nika, na katerega se "
-"転elite povezati."
-
-#: src/protocols/novell/novell.c:2171
+#: src/protocols/novell/novell.c:2170
+msgid "Unable to connect to server. Please enter the address of the server you wish to connect to."
+msgstr "Ni se mogo�e povezati na stre転nik. Vnesite naslov stre転nika, na katerega se 転elite povezati."
+
+#: src/protocols/novell/novell.c:2192
 msgid "Error. SSL support is not installed."
 msgstr "Napaka. Podpora SSL ni name邸�ena."
 
-#: src/protocols/novell/novell.c:2475
+#: src/protocols/novell/novell.c:2501
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Ta konferenca je bila zaprta. Spro�il se ne da po邸iljati ve�.ve�."
 
-#: src/protocols/novell/novell.c:2965 src/protocols/novell/novell.c:3047
-#: src/protocols/yahoo/yahoo.c:2839
+#: src/protocols/novell/novell.c:2998
+#: src/protocols/yahoo/yahoo.c:2856
 msgid "Appear Offline"
 msgstr "Izgledaj brez povezave"
 
@@ -7638,15 +8247,16 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:3540 src/protocols/novell/novell.c:3542
+#: src/protocols/novell/novell.c:3545
+#: src/protocols/novell/novell.c:3547
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Vstavek za protokol Novell GroupWise Messenger"
 
-#: src/protocols/novell/novell.c:3561
+#: src/protocols/novell/novell.c:3566
 msgid "Server address"
 msgstr "Naslov stre転nika"
 
-#: src/protocols/novell/novell.c:3565
+#: src/protocols/novell/novell.c:3570
 msgid "Server port"
 msgstr "Vrata stre転nika"
 
@@ -7746,217 +8356,214 @@
 msgid "Not while on AOL"
 msgstr "Na omre転ju AOL ni dovoljeno"
 
-#: src/protocols/oscar/oscar.c:417 src/protocols/oscar/oscar.c:502
-msgid ""
-"(There was an error receiving this message.  The buddy you are speaking to "
-"most likely has a buggy client.)"
-msgstr ""
-"(Pri邸lo je do napake pri prejemu tega sporo�ila. Prijatelj, s katerim se "
-"pogovarjate, ima verjetno hro邸�astega odjemalca.)"
-
-#: src/protocols/oscar/oscar.c:616
+#: src/protocols/oscar/oscar.c:419
+#: src/protocols/oscar/oscar.c:504
+msgid "(There was an error receiving this message.  The buddy you are speaking to most likely has a buggy client.)"
+msgstr "(Pri邸lo je do napake pri prejemu tega sporo�ila. Prijatelj, s katerim se pogovarjate, ima verjetno hro邸�astega odjemalca.)"
+
+#: src/protocols/oscar/oscar.c:618
 msgid "Voice"
 msgstr "Glasovno"
 
-#: src/protocols/oscar/oscar.c:619
+#: src/protocols/oscar/oscar.c:621
 msgid "AIM Direct IM"
 msgstr "Neposredni pogovor AIM"
 
-#: src/protocols/oscar/oscar.c:622 src/protocols/silc/silc.c:659
-#: src/protocols/silc/util.c:509
+#: src/protocols/oscar/oscar.c:624
+#: src/protocols/silc/silc.c:683
+#: src/protocols/silc/util.c:510
 msgid "Chat"
 msgstr "Pomenek"
 
-#: src/protocols/oscar/oscar.c:625 src/protocols/oscar/oscar.c:7898
+#: src/protocols/oscar/oscar.c:627
+#: src/protocols/oscar/oscar.c:7932
 msgid "Get File"
 msgstr "Sprejmi datoteko"
 
-#: src/protocols/oscar/oscar.c:632
+#: src/protocols/oscar/oscar.c:634
 msgid "Games"
 msgstr "Igre"
 
-#: src/protocols/oscar/oscar.c:635
+#: src/protocols/oscar/oscar.c:637
 msgid "Add-Ins"
 msgstr "Dodatki"
 
-#: src/protocols/oscar/oscar.c:638
+#: src/protocols/oscar/oscar.c:640
 msgid "Send Buddy List"
 msgstr "Po邸lji seznam prijateljev"
 
-#: src/protocols/oscar/oscar.c:641
+#: src/protocols/oscar/oscar.c:643
 msgid "ICQ Direct Connect"
 msgstr "Neposredna povezava ICQ"
 
-#: src/protocols/oscar/oscar.c:644
+#: src/protocols/oscar/oscar.c:646
 msgid "AP User"
 msgstr "AP uporabnik"
 
-#: src/protocols/oscar/oscar.c:647
+#: src/protocols/oscar/oscar.c:649
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:650
+#: src/protocols/oscar/oscar.c:652
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:653
+#: src/protocols/oscar/oscar.c:655
 msgid "ICQ Server Relay"
 msgstr "ICQ stre転ni邸ki posrednik"
 
-#: src/protocols/oscar/oscar.c:656
+#: src/protocols/oscar/oscar.c:658
 msgid "Old ICQ UTF8"
 msgstr "Star ICQ UTF-8"
 
-#: src/protocols/oscar/oscar.c:659
+#: src/protocols/oscar/oscar.c:661
 msgid "Trillian Encryption"
 msgstr "Trillian kodiranje"
 
-#: src/protocols/oscar/oscar.c:662
+#: src/protocols/oscar/oscar.c:664
 msgid "ICQ UTF8"
 msgstr "ICQ UTF-8"
 
-#: src/protocols/oscar/oscar.c:665
+#: src/protocols/oscar/oscar.c:667
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:668
+#: src/protocols/oscar/oscar.c:670
 msgid "Security Enabled"
 msgstr "Varnost vklju�ena"
 
-#: src/protocols/oscar/oscar.c:671
+#: src/protocols/oscar/oscar.c:673
 msgid "Video Chat"
 msgstr "Video.pomenek"
 
-#: src/protocols/oscar/oscar.c:675
+#: src/protocols/oscar/oscar.c:677
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: src/protocols/oscar/oscar.c:678
+#: src/protocols/oscar/oscar.c:680
 msgid "Live Video"
 msgstr "Video v 転ivo"
 
-#: src/protocols/oscar/oscar.c:681
+#: src/protocols/oscar/oscar.c:683
 msgid "Camera"
 msgstr "Kamera"
 
-#: src/protocols/oscar/oscar.c:699 src/protocols/oscar/oscar.c:7781
+#: src/protocols/oscar/oscar.c:701
+#: src/protocols/oscar/oscar.c:7815
 msgid "Free For Chat"
 msgstr "Na voljo za pogovor"
 
-#: src/protocols/oscar/oscar.c:703 src/protocols/oscar/oscar.c:7796
+#: src/protocols/oscar/oscar.c:705
+#: src/protocols/oscar/oscar.c:7830
 msgid "Not Available"
 msgstr "Ni na voljo"
 
-#: src/protocols/oscar/oscar.c:705 src/protocols/oscar/oscar.c:7786
+#: src/protocols/oscar/oscar.c:707
+#: src/protocols/oscar/oscar.c:7820
 msgid "Occupied"
 msgstr "Zaseden"
 
-#: src/protocols/oscar/oscar.c:709
+#: src/protocols/oscar/oscar.c:711
 msgid "Web Aware"
 msgstr "Zaveden interneta"
 
-#: src/protocols/oscar/oscar.c:786 src/protocols/oscar/oscar.c:5050
+#: src/protocols/oscar/oscar.c:788
+#: src/protocols/oscar/oscar.c:5052
 msgid "Warning Level"
 msgstr "Stopnja opozoril"
 
-#: src/protocols/oscar/oscar.c:792
+#: src/protocols/oscar/oscar.c:794
 msgid "Capabilities"
 msgstr "Zmo転nosti"
 
-#: src/protocols/oscar/oscar.c:801
+#: src/protocols/oscar/oscar.c:803
 msgid "Buddy Comment"
 msgstr "Komentar prijatelja"
 
-#: src/protocols/oscar/oscar.c:958
+#: src/protocols/oscar/oscar.c:960
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Neposredni pogovor z %s kon�an"
 
-#: src/protocols/oscar/oscar.c:960
+#: src/protocols/oscar/oscar.c:962
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Neposredni pogovor z %s ni bil uspe邸en"
 
-#: src/protocols/oscar/oscar.c:968
+#: src/protocols/oscar/oscar.c:970
 msgid "Direct Connect failed"
 msgstr "Neposredna povezava spodletela"
 
-#: src/protocols/oscar/oscar.c:1045 src/protocols/oscar/oscar.c:1176
+#: src/protocols/oscar/oscar.c:1047
+#: src/protocols/oscar/oscar.c:1178
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Neposredni pogovor z %s vzpostavljen"
 
-#: src/protocols/oscar/oscar.c:1126
+#: src/protocols/oscar/oscar.c:1128
 #, c-format
 msgid "Attempting to connect to %s at %s:%hu for Direct IM."
 msgstr "Poskus povezave z %s pri %s:%hu za Direct IM."
 
-#: src/protocols/oscar/oscar.c:1547
+#: src/protocols/oscar/oscar.c:1549
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "Spra邸evanje %s za povezavo na nas pri %s:%hu za Direct IM."
 
-#: src/protocols/oscar/oscar.c:1552
+#: src/protocols/oscar/oscar.c:1554
 msgid "Unable to open Direct IM"
 msgstr "Neposredne povezave ni bilo mogo�e vzpostaviti"
 
-#: src/protocols/oscar/oscar.c:1587
+#: src/protocols/oscar/oscar.c:1589
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Izbrali ste neposredno povezovanje z %s."
 
-#: src/protocols/oscar/oscar.c:1591
-msgid ""
-"Because this reveals your IP address, it may be considered a privacy risk.  "
-"Do you wish to continue?"
-msgstr ""
-"Ker to razkrije va邸 IP naslov, se to obravnava kot kr邸enje zasebnosti. Ali "
-"転elite nadaljevati?"
-
-#: src/protocols/oscar/oscar.c:1595 src/protocols/oscar/oscar.c:4361
+#: src/protocols/oscar/oscar.c:1593
+msgid "Because this reveals your IP address, it may be considered a privacy risk.  Do you wish to continue?"
+msgstr "Ker to razkrije va邸 IP naslov, se to obravnava kot kr邸enje zasebnosti. Ali 転elite nadaljevati?"
+
+#: src/protocols/oscar/oscar.c:1597
+#: src/protocols/oscar/oscar.c:4363
+#: src/protocols/sametime/sametime.c:3591
 msgid "Connect"
 msgstr "Pove転i se"
 
-#: src/protocols/oscar/oscar.c:1661
+#: src/protocols/oscar/oscar.c:1663
 #, c-format
 msgid "You have lost your connection to chat room %s."
 msgstr "Povezava do pogovorne sobe %s je bila prekinjena."
 
-#: src/protocols/oscar/oscar.c:1684
+#: src/protocols/oscar/oscar.c:1686
 msgid "Chat is currently unavailable"
 msgstr "Pomenek tenutno ni na voljo"
 
-#: src/protocols/oscar/oscar.c:1754
+#: src/protocols/oscar/oscar.c:1756
 msgid "Screen name sent"
 msgstr "Vzdevek poslan"
 
-#: src/protocols/oscar/oscar.c:1770
-#, c-format
-msgid ""
-"Unable to login: Could not sign on as %s because the screen name is "
-"invalid.  Screen names must either start with a letter and contain only "
-"letters, numbers and spaces, or contain only numbers."
-msgstr ""
-"Prijava ni mogo�a: ni se mogo�e prijaviti kot %s, ker je vzdevek neveljaven. "
-"Vzdevki se morajo za�eti s �rko, vsebujejo lahko le �rke, 邸tevilke in "
-"presledke, lahko pa so tudi sestavljeni iz samih 邸tevil."
-
-#: src/protocols/oscar/oscar.c:1799
+#: src/protocols/oscar/oscar.c:1772
+#, c-format
+msgid "Unable to login: Could not sign on as %s because the screen name is invalid.  Screen names must either start with a letter and contain only letters, numbers and spaces, or contain only numbers."
+msgstr "Prijava ni mogo�a: ni se mogo�e prijaviti kot %s, ker je vzdevek neveljaven. Vzdevki se morajo za�eti s �rko, vsebujejo lahko le �rke, 邸tevilke in presledke, lahko pa so tudi sestavljeni iz samih 邸tevil."
+
+#: src/protocols/oscar/oscar.c:1801
 msgid "Unable to login to AIM"
 msgstr "Nisem se mogel povezati na AIM"
 
-#: src/protocols/oscar/oscar.c:1903 src/protocols/oscar/oscar.c:2846
+#: src/protocols/oscar/oscar.c:1905
+#: src/protocols/oscar/oscar.c:2856
 msgid "Could Not Connect"
 msgstr "Nisem se mogel povezati"
 
-#: src/protocols/oscar/oscar.c:1911
+#: src/protocols/oscar/oscar.c:1913
 msgid "Connection established, cookie sent"
 msgstr "Povezava vzpostavljena, pi邸kotek poslan"
 
 #. clientip & verifiedip failed, request a redirect
 #. * that is, we want the sender to connect to us
 #. Let the user not to lose hope quite yet
-#: src/protocols/oscar/oscar.c:2063
+#: src/protocols/oscar/oscar.c:2065
 msgid "Attempting connection redirect..."
 msgstr "Poskus preusmeritve povezave ..."
 
@@ -7964,101 +8571,93 @@
 #. * Yes, it's a bit odd to ask the user to enable proxied file transfers
 #. * when it's a proxied transfer that timed out. It is possible that a
 #. * stage 1/2 proxied transfer might work when a stage 3 will not.
-#: src/protocols/oscar/oscar.c:2108
+#: src/protocols/oscar/oscar.c:2110
 #, c-format
 msgid ""
 "Transfer of file %s timed out.\n"
-" Try enabling proxy servers for file transfers in Tools->Preferences->AIM/"
-"ICQ."
+" Try enabling proxy servers for file transfers in Tools->Preferences->AIM/ICQ."
 msgstr ""
 "Prenos datoteke %s je prekora�il �as.\n"
-"Poskusite omogo�iti stre転nike proxy za prenos datotek vOrodja -> Nastavitve -"
-"> AIM/ICQ."
-
-#: src/protocols/oscar/oscar.c:2206 src/protocols/yahoo/yahoo_filexfer.c:174
+"Poskusite omogo�iti stre転nike proxy za prenos datotek vOrodja -> Nastavitve -> AIM/ICQ."
+
+#: src/protocols/oscar/oscar.c:2208
+#: src/protocols/yahoo/yahoo_filexfer.c:174
 #: src/protocols/yahoo/yahoo_filexfer.c:183
 #: src/protocols/yahoo/yahoo_filexfer.c:192
 msgid "Unable to establish file descriptor."
 msgstr "Opisa datoteke ni bilo mogo�e vzpostaviti."
 
-#: src/protocols/oscar/oscar.c:2211
+#: src/protocols/oscar/oscar.c:2213
 msgid "Unable to create new connection."
 msgstr "Ni bilo mogo�e vzpostaviti nove povezave."
 
-#: src/protocols/oscar/oscar.c:2445 src/protocols/oscar/oscar.c:2454
-#: src/protocols/oscar/oscar.c:2468 src/protocols/oscar/oscar.c:2478
+#: src/protocols/oscar/oscar.c:2447
+#: src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:2470
+#: src/protocols/oscar/oscar.c:2480
 msgid "Unable to log into file transfer proxy."
 msgstr "Prijava v proxy prenosa datotek ni bila mogo�a."
 
-#: src/protocols/oscar/oscar.c:2532
+#: src/protocols/oscar/oscar.c:2534
 msgid "Unable to establish listener socket or no AOL proxy connection present."
-msgstr ""
-"Vti�nika za poslu邸anje ni bilo mogo�e vzpostaviti ali pa povezava proxy AOL "
-"ni prisotna."
-
-#: src/protocols/oscar/oscar.c:2733 src/protocols/toc/toc.c:543
+msgstr "Vti�nika za poslu邸anje ni bilo mogo�e vzpostaviti ali pa povezava proxy AOL ni prisotna."
+
+#: src/protocols/oscar/oscar.c:2742
+#: src/protocols/toc/toc.c:543
 msgid "Incorrect nickname or password."
 msgstr "Neveljaven vzdevek ali geslo."
 
-#: src/protocols/oscar/oscar.c:2738
+#: src/protocols/oscar/oscar.c:2747
 msgid "Your account is currently suspended."
 msgstr "Va邸 ra�un je trenutno zamrznjen."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:2742
+#: src/protocols/oscar/oscar.c:2751
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Storitev AOL neposrednih sporo�il je trenuno nedosegljiva."
 
-#: src/protocols/oscar/oscar.c:2747
-msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
-msgstr ""
-"Povezava ste preve�krat vzpostavili in prekinili. Po�akajte deset minut in "
-"poskusite ponovno. �e ne po�akate sedaj, boste �akali 邸e dalj."
-
-#: src/protocols/oscar/oscar.c:2752
+#: src/protocols/oscar/oscar.c:2756
+msgid "You have been connecting and disconnecting too frequently. Wait ten minutes and try again. If you continue to try, you will need to wait even longer."
+msgstr "Povezava ste preve�krat vzpostavili in prekinili. Po�akajte deset minut in poskusite ponovno. �e ne po�akate sedaj, boste �akali 邸e dalj."
+
+#: src/protocols/oscar/oscar.c:2761
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr ""
-"Razli�ica odjemalca, ki ga uporabljate, je prestara. Prosim posodobite ga "
-"pri %s"
-
-#: src/protocols/oscar/oscar.c:2783
+msgstr "Razli�ica odjemalca, ki ga uporabljate, je prestara. Prosim posodobite ga pri %s"
+
+#: src/protocols/oscar/oscar.c:2792
 msgid "Internal Error"
 msgstr "Interna napaka"
 
-#: src/protocols/oscar/oscar.c:2853
+#: src/protocols/oscar/oscar.c:2863
 msgid "Received authorization"
 msgstr "Ponovno zahtevaj pooblastitev"
 
-#: src/protocols/oscar/oscar.c:2877
+#: src/protocols/oscar/oscar.c:2887
 msgid "The SecurID key entered is invalid."
 msgstr "Vne邸eni klju� SecurID ni veljaven."
 
-#: src/protocols/oscar/oscar.c:2891
+#: src/protocols/oscar/oscar.c:2901
 msgid "Enter SecurID"
 msgstr "Vnesite SecurID"
 
-#: src/protocols/oscar/oscar.c:2892
+#: src/protocols/oscar/oscar.c:2902
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Vnesite 邸tevilo s 6 ciframi iz digitalnega prikazovalnika."
 
-#: src/protocols/oscar/oscar.c:2932 src/protocols/oscar/oscar.c:2962
-#: src/protocols/oscar/oscar.c:3051
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-"Morda bo povezava v kratkem prekinjena. Morda boste 転eleli uporabiti TOC "
-"dokler to ni popravljeno. Preverite %s za posodobitve."
-
-#: src/protocols/oscar/oscar.c:2935 src/protocols/oscar/oscar.c:2965
+#: src/protocols/oscar/oscar.c:2942
+#: src/protocols/oscar/oscar.c:2972
+#: src/protocols/oscar/oscar.c:3061
+#, c-format
+msgid "You may be disconnected shortly.  You may want to use TOC until this is fixed.  Check %s for updates."
+msgstr "Morda bo povezava v kratkem prekinjena. Morda boste 転eleli uporabiti TOC dokler to ni popravljeno. Preverite %s za posodobitve."
+
+#: src/protocols/oscar/oscar.c:2945
+#: src/protocols/oscar/oscar.c:2975
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim ni mogel dobiti veljavnega prijavnega izvle�ka za AIM."
 
-#: src/protocols/oscar/oscar.c:3054
+#: src/protocols/oscar/oscar.c:3064
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim ni mogel dobiti veljavnega prijavnega izvle�ka."
 
@@ -8066,92 +8665,84 @@
 msgid "Password sent"
 msgstr "Geslo poslano"
 
-#: src/protocols/oscar/oscar.c:4352
+#: src/protocols/oscar/oscar.c:4354
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s je pravkar prosil za neposredno povezavo z %s"
 
-#: src/protocols/oscar/oscar.c:4355
-msgid ""
-"This requires a direct connection between the two computers and is necessary "
-"for IM Images.  Because your IP address will be revealed, this may be "
-"considered a privacy risk."
-msgstr ""
-"To zahteva neposredno povezavo med dvema ra�unalnikoma in je za vstavljene "
-"slike nujno potrebno. Ker bo izdan va邸 IP naslov, je to lahko tveganje "
-"varnosti."
-
-#: src/protocols/oscar/oscar.c:4394
+#: src/protocols/oscar/oscar.c:4357
+msgid "This requires a direct connection between the two computers and is necessary for IM Images.  Because your IP address will be revealed, this may be considered a privacy risk."
+msgstr "To zahteva neposredno povezavo med dvema ra�unalnikoma in je za vstavljene slike nujno potrebno. Ker bo izdan va邸 IP naslov, je to lahko tveganje varnosti."
+
+#: src/protocols/oscar/oscar.c:4396
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Prosim za pooblastilo, da vas smem dodati na svoj seznam prijateljev."
 
-#: src/protocols/oscar/oscar.c:4402
+#: src/protocols/oscar/oscar.c:4404
 msgid "Authorization Request Message:"
 msgstr "Sporo�ilo o zahtevi po pooblastilu:"
 
-#: src/protocols/oscar/oscar.c:4403
+#: src/protocols/oscar/oscar.c:4405
 msgid "Please authorize me!"
 msgstr "Prosim za pooblastilo!"
 
-#: src/protocols/oscar/oscar.c:4433
-#, c-format
-msgid ""
-"The user %s requires authorization before being added to a buddy list.  Do "
-"you want to send an authorization request?"
-msgstr ""
-"Uporabnik %s zahteva pooblastilo preden je dodan na seznam prijateljev. Ali "
-"転elite poslati zahtevo po pooblastilu?"
-
-#: src/protocols/oscar/oscar.c:4438 src/protocols/oscar/oscar.c:4440
+#: src/protocols/oscar/oscar.c:4435
+#, c-format
+msgid "The user %s requires authorization before being added to a buddy list.  Do you want to send an authorization request?"
+msgstr "Uporabnik %s zahteva pooblastilo preden je dodan na seznam prijateljev. Ali 転elite poslati zahtevo po pooblastilu?"
+
+#: src/protocols/oscar/oscar.c:4440
+#: src/protocols/oscar/oscar.c:4442
 msgid "Request Authorization"
 msgstr "Zahtevaj pooblastilo"
 
-#: src/protocols/oscar/oscar.c:4478 src/protocols/oscar/oscar.c:4484
-#: src/protocols/oscar/oscar.c:4588 src/protocols/oscar/oscar.c:4612
-#: src/protocols/oscar/oscar.c:7234 src/protocols/oscar/oscar.c:7286
+#: src/protocols/oscar/oscar.c:4480
+#: src/protocols/oscar/oscar.c:4486
+#: src/protocols/oscar/oscar.c:4590
+#: src/protocols/oscar/oscar.c:4614
+#: src/protocols/oscar/oscar.c:7260
+#: src/protocols/oscar/oscar.c:7312
 msgid "No reason given."
 msgstr "Ni podanega razloga."
 
-#: src/protocols/oscar/oscar.c:4483
+#: src/protocols/oscar/oscar.c:4485
 msgid "Authorization Denied Message:"
 msgstr "Sporo�ilo o neodobrenem pooblastilu:"
 
-#: src/protocols/oscar/oscar.c:4590
+#: src/protocols/oscar/oscar.c:4592
 #, c-format
 msgid ""
 "The user %u wants to add %s to their buddy list for the following reason:\n"
 "%s"
 msgstr ""
-"Uporabnik %u 転eli dodati %s na svoj seznam prijateljev iz naslednjega "
-"razloga:\n"
+"Uporabnik %u 転eli dodati %s na svoj seznam prijateljev iz naslednjega razloga:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4600 src/protocols/oscar/oscar.c:7246
+#: src/protocols/oscar/oscar.c:4602
+#: src/protocols/oscar/oscar.c:7272
 msgid "Authorization Request"
 msgstr "Zahtevek po pooblastilu"
 
-#: src/protocols/oscar/oscar.c:4612
+#: src/protocols/oscar/oscar.c:4614
 #, c-format
 msgid ""
-"The user %u has denied your request to add them to your buddy list for the "
-"following reason:\n"
+"The user %u has denied your request to add them to your buddy list for the following reason:\n"
 "%s"
 msgstr ""
-"Uporabnik %u je zavrnil zahtevo, da bi ga dodali na svoj seznam prijateljev "
-"z naslednjim razlogom:\n"
+"Uporabnik %u je zavrnil zahtevo, da bi ga dodali na svoj seznam prijateljev z naslednjim razlogom:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4613
+#: src/protocols/oscar/oscar.c:4615
 msgid "ICQ authorization denied."
 msgstr "Overovitev ICQ zavrnjena."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:4620
+#: src/protocols/oscar/oscar.c:4622
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "Uporabik %u vam je dovolil, da ga dodate na svoj seznam prijateljev."
 
-#: src/protocols/oscar/oscar.c:4628
+#: src/protocols/oscar/oscar.c:4630
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8164,7 +8755,7 @@
 "Od: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4636
+#: src/protocols/oscar/oscar.c:4638
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8177,7 +8768,7 @@
 "Od: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4644
+#: src/protocols/oscar/oscar.c:4646
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -8190,20 +8781,20 @@
 "Sporo�ilo je:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4665
+#: src/protocols/oscar/oscar.c:4667
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "Uporabnik ICQ %u vam je poslal vizitko: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:4671
+#: src/protocols/oscar/oscar.c:4673
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Ali 転elite dodati prijatelja s to vizitko na va邸 seznam prijateljev?"
 
-#: src/protocols/oscar/oscar.c:4675
+#: src/protocols/oscar/oscar.c:4677
 msgid "Decline"
 msgstr "Zavrni"
 
-#: src/protocols/oscar/oscar.c:4759
+#: src/protocols/oscar/oscar.c:4761
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
@@ -8212,7 +8803,7 @@
 msgstr[2] "Spregledali ste %hu sporo�ili od %s, ker sta bili neveljavni."
 msgstr[3] "Spregledali ste %hu sporo�ila od %s, ker so bila neveljavna."
 
-#: src/protocols/oscar/oscar.c:4768
+#: src/protocols/oscar/oscar.c:4770
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
@@ -8221,18 +8812,16 @@
 msgstr[2] "Spregledali ste %hu sporo�ili od %s, ker sta bili neveljavni."
 msgstr[3] "Spregledali ste %hu sporo�ila od %s, ker so bila neveljavna."
 
-#: src/protocols/oscar/oscar.c:4777
-#, c-format
-msgid ""
-"You missed %hu message from %s because the rate limit has been exceeded."
-msgid_plural ""
-"You missed %hu messages from %s because the rate limit has been exceeded."
+#: src/protocols/oscar/oscar.c:4779
+#, c-format
+msgid "You missed %hu message from %s because the rate limit has been exceeded."
+msgid_plural "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "Spregledali ste %hu sporo�il od %s, ker so bila neveljavna."
 msgstr[1] "Spregledali ste %hu sporo�ilo od %s, ker je bilo neveljavno."
 msgstr[2] "Spregledali ste %hu sporo�ili od %s, ker sta bili neveljavni."
 msgstr[3] "Spregledali ste %hu sporo�ila od %s, ker so bila neveljavna."
 
-#: src/protocols/oscar/oscar.c:4786
+#: src/protocols/oscar/oscar.c:4788
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
@@ -8241,7 +8830,7 @@
 msgstr[2] "Spregledali ste %hu sporo�ili od %s, ker sta bili neveljavni."
 msgstr[3] "Spregledali ste %hu sporo�ila od %s, ker so bila neveljavna."
 
-#: src/protocols/oscar/oscar.c:4795
+#: src/protocols/oscar/oscar.c:4797
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
@@ -8250,7 +8839,7 @@
 msgstr[2] "Spregledali ste %hu sporo�ili od %s, ker sta bili neveljavni."
 msgstr[3] "Spregledali ste %hu sporo�ila od %s, ker so bila neveljavna."
 
-#: src/protocols/oscar/oscar.c:4804
+#: src/protocols/oscar/oscar.c:4806
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
@@ -8259,232 +8848,197 @@
 msgstr[2] "Spregledali ste %hu sporo�ili od %s, ker sta bili neveljavni."
 msgstr[3] "Spregledali ste %hu sporo�ila od %s, ker so bila neveljavna."
 
-#: src/protocols/oscar/oscar.c:4863
+#: src/protocols/oscar/oscar.c:4865
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>Stanje:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:4924
+#: src/protocols/oscar/oscar.c:4926
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC je izvrgel napako: %s\n"
 
 #  Data is assumed to be the destination sn
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:4961
+#: src/protocols/oscar/oscar.c:4963
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Ni bilo mo� poslati sporo�ila: %s"
 
-#: src/protocols/oscar/oscar.c:4961 src/protocols/oscar/oscar.c:4966
-#: src/protocols/oscar/oscar.c:5024 src/protocols/oscar/oscar.c:5028
+#: src/protocols/oscar/oscar.c:4963
+#: src/protocols/oscar/oscar.c:4968
+#: src/protocols/oscar/oscar.c:5026
+#: src/protocols/oscar/oscar.c:5030
 msgid "Unknown reason."
 msgstr "Neznan vzrok."
 
-#: src/protocols/oscar/oscar.c:4964
+#: src/protocols/oscar/oscar.c:4966
+#: src/protocols/sametime/sametime.c:2336
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Ni bilo mo� poslati sporo�ila k %s:"
 
-#: src/protocols/oscar/oscar.c:5024
+#: src/protocols/oscar/oscar.c:5026
 #, c-format
 msgid "User information not available: %s"
 msgstr "Podatki o uporabniku niso dostopni: %s"
 
-#: src/protocols/oscar/oscar.c:5027
+#: src/protocols/oscar/oscar.c:5029
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Podatki o uporabniku %s niso dostopni:"
 
-#: src/protocols/oscar/oscar.c:5054
+#: src/protocols/oscar/oscar.c:5056
 msgid "Online Since"
 msgstr "Na zvezi od"
 
-#: src/protocols/oscar/oscar.c:5059 src/protocols/yahoo/yahoo_profile.c:1118
+#: src/protocols/oscar/oscar.c:5061
+#: src/protocols/yahoo/yahoo_profile.c:1118
 msgid "Member Since"
 msgstr "�lan od"
 
-#: src/protocols/oscar/oscar.c:5142
+#: src/protocols/oscar/oscar.c:5190
 msgid "Your AIM connection may be lost."
 msgstr "Va邸a povezava z AIM je morda prekinjena."
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:5328
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Ni mogo�e prikazati sporo�ila tega uporabnika, ker vsebuje neveljavne "
-"znake.]"
-
-#: src/protocols/oscar/oscar.c:5554
+#: src/protocols/oscar/oscar.c:5376
+msgid "[Unable to display a message from this user because it contained invalid characters.]"
+msgstr "[Ni mogo�e prikazati sporo�ila tega uporabnika, ker vsebuje neveljavne znake.]"
+
+#: src/protocols/oscar/oscar.c:5602
 msgid "Rate limiting error."
 msgstr "Napaka z omejevanjem pogostosti sporo�il."
 
-#: src/protocols/oscar/oscar.c:5555
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again."
-msgstr ""
-"Zadnjega dejanja, ki ste ga 転eleli izvesti, ni bilo mogo�e izvesti, ker ste "
-"prekora�ili dovoljeno pogostost. Prosim po�akajte 10 sekund in poskusite "
-"znova."
-
-#: src/protocols/oscar/oscar.c:5631
+#: src/protocols/oscar/oscar.c:5603
+msgid "The last action you attempted could not be performed because you are over the rate limit. Please wait 10 seconds and try again."
+msgstr "Zadnjega dejanja, ki ste ga 転eleli izvesti, ni bilo mogo�e izvesti, ker ste prekora�ili dovoljeno pogostost. Prosim po�akajte 10 sekund in poskusite znova."
+
+#: src/protocols/oscar/oscar.c:5679
 msgid "You have been signed off for an unknown reason."
 msgstr "Odjavljeni ste bili iz neznanega razloga."
 
-#: src/protocols/oscar/oscar.c:5644 src/protocols/toc/toc.c:971
+#: src/protocols/oscar/oscar.c:5692
+#: src/protocols/toc/toc.c:971
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Povezava do pogovorne sobe %s je bila prekinjena."
 
 #. XXX - Don't call this with ssi
-#: src/protocols/oscar/oscar.c:5669
+#: src/protocols/oscar/oscar.c:5717
 msgid "Finalizing connection"
 msgstr "Dokon�ujem povezavo"
 
-#: src/protocols/oscar/oscar.c:5951
-msgid "UIN"
-msgstr "UIN"
-
-#: src/protocols/oscar/oscar.c:5977 src/protocols/silc/util.c:541
+#: src/protocols/oscar/oscar.c:6026
+#: src/protocols/silc/util.c:542
 msgid "Mobile Phone"
 msgstr "Mobilni telefon"
 
-#: src/protocols/oscar/oscar.c:5979
-msgid "Female"
-msgstr "貼enska"
-
-#: src/protocols/oscar/oscar.c:5979
-msgid "Male"
-msgstr "Mo邸ki"
-
-#: src/protocols/oscar/oscar.c:5995
+#: src/protocols/oscar/oscar.c:6044
 msgid "Personal Web Page"
 msgstr "Osebna spletna stran"
 
-#: src/protocols/oscar/oscar.c:5999
+#: src/protocols/oscar/oscar.c:6048
 msgid "Additional Information"
 msgstr "Dodatne informacije"
 
-#: src/protocols/oscar/oscar.c:6004
+#: src/protocols/oscar/oscar.c:6053
 msgid "Home Address"
 msgstr "Doma�i naslov"
 
-#: src/protocols/oscar/oscar.c:6008 src/protocols/oscar/oscar.c:6016
+#: src/protocols/oscar/oscar.c:6057
+#: src/protocols/oscar/oscar.c:6065
 msgid "Zip Code"
 msgstr "Po邸tna 邸tevilka"
 
-#: src/protocols/oscar/oscar.c:6012
+#: src/protocols/oscar/oscar.c:6061
 msgid "Work Address"
 msgstr "Slu転beni naslov"
 
-#: src/protocols/oscar/oscar.c:6020
+#: src/protocols/oscar/oscar.c:6069
 msgid "Work Information"
 msgstr "Informacije o zaposlitvi"
 
-#: src/protocols/oscar/oscar.c:6021
+#: src/protocols/oscar/oscar.c:6070
 msgid "Company"
 msgstr "Podjetje"
 
-#: src/protocols/oscar/oscar.c:6022
+#: src/protocols/oscar/oscar.c:6071
 msgid "Division"
 msgstr "Oddelek"
 
-#: src/protocols/oscar/oscar.c:6023
+#: src/protocols/oscar/oscar.c:6072
 msgid "Position"
 msgstr "Delovno mesto"
 
-#: src/protocols/oscar/oscar.c:6025
+#: src/protocols/oscar/oscar.c:6074
 msgid "Web Page"
 msgstr "Spletna stran"
 
-#: src/protocols/oscar/oscar.c:6082
+#: src/protocols/oscar/oscar.c:6131
 msgid "Pop-Up Message"
 msgstr "Pojavno sporo�ilo"
 
 #. TODO: Need to use ngettext() here
-#: src/protocols/oscar/oscar.c:6111
+#: src/protocols/oscar/oscar.c:6160
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr "Naslednji vzdevki so povezani z %s"
 
-#: src/protocols/oscar/oscar.c:6140
+#: src/protocols/oscar/oscar.c:6189
 #, c-format
 msgid "No results found for email address %s"
 msgstr "Za dani elektronski naslov %s ni bilo rezultatov"
 
-#: src/protocols/oscar/oscar.c:6161
+#: src/protocols/oscar/oscar.c:6210
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "Prejeti bi morali elektronsko po邸to, da potrdite %s. "
 
-#: src/protocols/oscar/oscar.c:6163
+#: src/protocols/oscar/oscar.c:6212
 msgid "Account Confirmation Requested"
 msgstr "Potrditev ra�una je bila zahtevana"
 
-#: src/protocols/oscar/oscar.c:6194
+#: src/protocols/oscar/oscar.c:6243
 msgid "Error Changing Account Info"
 msgstr "Napaka pri spreminjanju podatkov o ra�unu"
 
-#: src/protocols/oscar/oscar.c:6197
-#, c-format
-msgid ""
-"Error 0x%04x: Unable to format screen name because the requested screen name "
-"differs from the original."
-msgstr ""
-"Napaka 0x%04x: Ni bilo mogo�e oblikovati poimenovanja, ker se zahtevano "
-"poimenovanje razlikuje od izvirnega."
-
-#: src/protocols/oscar/oscar.c:6200
+#: src/protocols/oscar/oscar.c:6246
+#, c-format
+msgid "Error 0x%04x: Unable to format screen name because the requested screen name differs from the original."
+msgstr "Napaka 0x%04x: Ni bilo mogo�e oblikovati poimenovanja, ker se zahtevano poimenovanje razlikuje od izvirnega."
+
+#: src/protocols/oscar/oscar.c:6249
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
-msgstr ""
-"Napaka 0x%04x: Ni bilo mogo�e oblikovati poimenovanja, ker je neveljavno."
-
-#: src/protocols/oscar/oscar.c:6203
-#, c-format
-msgid ""
-"Error 0x%04x: Unable to format screen name because the requested screen name "
-"is too long."
-msgstr ""
-"Napaka 0x%04x: Ni bilo mogo�e oblikovati poimenovanja, ker je zahtevano "
-"poimenovanje predolgo."
-
-#: src/protocols/oscar/oscar.c:6206
-#, c-format
-msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
-"request pending for this screen name."
-msgstr ""
-"Napaka 0x%04x: Ni bilo mogo�e spremeniti elektronskega naslova, ker je 転e en "
-"zahtevek v �akanju za to ime."
-
-#: src/protocols/oscar/oscar.c:6209
-#, c-format
-msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
-"too many screen names associated with it."
-msgstr ""
-"Napaka 0x%04x: Ni mogo�e spremeniti elektronskega naslova ker ima podan "
-"naslov 転e preve� ra�unov."
-
-#: src/protocols/oscar/oscar.c:6212
-#, c-format
-msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
-"invalid."
-msgstr ""
-"Napaka 0x%04x: Ni mogo�e spremeniti elektronskega naslova ker je podan "
-"naslov neveljaven."
-
-#: src/protocols/oscar/oscar.c:6215
+msgstr "Napaka 0x%04x: Ni bilo mogo�e oblikovati poimenovanja, ker je neveljavno."
+
+#: src/protocols/oscar/oscar.c:6252
+#, c-format
+msgid "Error 0x%04x: Unable to format screen name because the requested screen name is too long."
+msgstr "Napaka 0x%04x: Ni bilo mogo�e oblikovati poimenovanja, ker je zahtevano poimenovanje predolgo."
+
+#: src/protocols/oscar/oscar.c:6255
+#, c-format
+msgid "Error 0x%04x: Unable to change email address because there is already a request pending for this screen name."
+msgstr "Napaka 0x%04x: Ni bilo mogo�e spremeniti elektronskega naslova, ker je 転e en zahtevek v �akanju za to ime."
+
+#: src/protocols/oscar/oscar.c:6258
+#, c-format
+msgid "Error 0x%04x: Unable to change email address because the given address has too many screen names associated with it."
+msgstr "Napaka 0x%04x: Ni mogo�e spremeniti elektronskega naslova ker ima podan naslov 転e preve� ra�unov."
+
+#: src/protocols/oscar/oscar.c:6261
+#, c-format
+msgid "Error 0x%04x: Unable to change email address because the given address is invalid."
+msgstr "Napaka 0x%04x: Ni mogo�e spremeniti elektronskega naslova ker je podan naslov neveljaven."
+
+#: src/protocols/oscar/oscar.c:6264
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Napaka 0x%04x: Neznana napaka."
 
-#: src/protocols/oscar/oscar.c:6225
+#: src/protocols/oscar/oscar.c:6274
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -8493,375 +9047,309 @@
 "Va邸e ime je trenutno naslednje oblike:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6226 src/protocols/oscar/oscar.c:6233
+#: src/protocols/oscar/oscar.c:6275
+#: src/protocols/oscar/oscar.c:6282
 msgid "Account Info"
 msgstr "Podatki o ra�unu"
 
-#: src/protocols/oscar/oscar.c:6231
+#: src/protocols/oscar/oscar.c:6280
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "Elektronski naslov za %s je %s"
 
-#: src/protocols/oscar/oscar.c:6298
-msgid ""
-"Your IM Image was not sent. You must be Direct Connected to send IM Images."
-msgstr ""
-"Va邸a slika IM ni bila poslana. Za po邸iljanje slik IM morate biti "
-"\"neposredno povezani\"."
-
-#: src/protocols/oscar/oscar.c:6480
+#: src/protocols/oscar/oscar.c:6347
+msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
+msgstr "Va邸a slika IM ni bila poslana. Za po邸iljanje slik IM morate biti \"neposredno povezani\"."
+
+#: src/protocols/oscar/oscar.c:6566
 msgid "Unable to set AIM profile."
 msgstr "Ni mogo�e nastaviti AIM profila."
 
-#: src/protocols/oscar/oscar.c:6481
-msgid ""
-"You have probably requested to set your profile before the login procedure "
-"completed.  Your profile remains unset; try setting it again when you are "
-"fully connected."
-msgstr ""
-"Verjetno ste zahtevali, da spremenite svoj profil preden je bila prijava "
-"dokon�ana. Za zdaj je va邸 profil nespremenjen; poskusite ponovno, ko boste "
-"zagotovo prijavljeni."
-
-#: src/protocols/oscar/oscar.c:6495
-#, c-format
-msgid ""
-"The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
-"it for you."
-msgid_plural ""
-"The maximum profile length of %d bytes has been exceeded.  Gaim has "
-"truncated it for you."
-msgstr[0] ""
-"Najve�ja dol転ina profila %d bajtov je bila prese転ena.  Gaim ga je skraj邸al "
-"namesto vas."
-msgstr[1] ""
-"Najve�ja dol転ina profila %d bajte je bila prese転ena.  Gaim ga je skraj邸al "
-"namesto vas."
-msgstr[2] ""
-"Najve�ja dol転ina profila %d bajta je bila prese転ena.  Gaim ga je skraj邸al "
-"namesto vas."
-msgstr[3] ""
-"Najve�ja dol転ina profila %d bajte je bila prese転ena.  Gaim ga je skraj邸al "
-"namesto vas."
-
-#: src/protocols/oscar/oscar.c:6500
+#: src/protocols/oscar/oscar.c:6567
+msgid "You have probably requested to set your profile before the login procedure completed.  Your profile remains unset; try setting it again when you are fully connected."
+msgstr "Verjetno ste zahtevali, da spremenite svoj profil preden je bila prijava dokon�ana. Za zdaj je va邸 profil nespremenjen; poskusite ponovno, ko boste zagotovo prijavljeni."
+
+#: src/protocols/oscar/oscar.c:6581
+#, c-format
+msgid "The maximum profile length of %d byte has been exceeded.  Gaim has truncated it for you."
+msgid_plural "The maximum profile length of %d bytes has been exceeded.  Gaim has truncated it for you."
+msgstr[0] "Najve�ja dol転ina profila %d bajtov je bila prese転ena.  Gaim ga je skraj邸al namesto vas."
+msgstr[1] "Najve�ja dol転ina profila %d bajte je bila prese転ena.  Gaim ga je skraj邸al namesto vas."
+msgstr[2] "Najve�ja dol転ina profila %d bajta je bila prese転ena.  Gaim ga je skraj邸al namesto vas."
+msgstr[3] "Najve�ja dol転ina profila %d bajte je bila prese転ena.  Gaim ga je skraj邸al namesto vas."
+
+#: src/protocols/oscar/oscar.c:6586
 msgid "Profile too long."
 msgstr "Profil je predolg."
 
-#: src/protocols/oscar/oscar.c:6523 src/protocols/oscar/oscar.c:6596
-#, c-format
-msgid ""
-"The maximum away message length of %d byte has been exceeded.  Gaim has "
-"truncated it for you."
-msgid_plural ""
-"The maximum away message length of %d bytes has been exceeded.  Gaim has "
-"truncated it for you."
-msgstr[0] ""
-"Najve�ja dol転ina sporo�ila odsotnosti %d bajtov je bila prese転ena.  Gaim ga "
-"je skraj邸al namesto vas."
-msgstr[1] ""
-"Najve�ja dol転ina sporo�ila odsotnosti %d bajt je bila prese転ena.  Gaim ga je "
-"skraj邸al namesto vas."
-msgstr[2] ""
-"Najve�ja dol転ina sporo�ila odsotnosti %d bajta je bila prese転ena.  Gaim ga "
-"je skraj邸al namesto vas."
-msgstr[3] ""
-"Najve�ja dol転ina sporo�ila odsotnosti %d bajte je bila prese転ena.  Gaim ga "
-"je skraj邸al namesto vas."
-
-#: src/protocols/oscar/oscar.c:6528 src/protocols/oscar/oscar.c:6601
+#: src/protocols/oscar/oscar.c:6622
+#, c-format
+msgid "The maximum away message length of %d byte has been exceeded.  Gaim has truncated it for you."
+msgid_plural "The maximum away message length of %d bytes has been exceeded.  Gaim has truncated it for you."
+msgstr[0] "Najve�ja dol転ina sporo�ila odsotnosti %d bajtov je bila prese転ena.  Gaim ga je skraj邸al namesto vas."
+msgstr[1] "Najve�ja dol転ina sporo�ila odsotnosti %d bajt je bila prese転ena.  Gaim ga je skraj邸al namesto vas."
+msgstr[2] "Najve�ja dol転ina sporo�ila odsotnosti %d bajta je bila prese転ena.  Gaim ga je skraj邸al namesto vas."
+msgstr[3] "Najve�ja dol転ina sporo�ila odsotnosti %d bajte je bila prese転ena.  Gaim ga je skraj邸al namesto vas."
+
+#: src/protocols/oscar/oscar.c:6627
 msgid "Away message too long."
 msgstr "Spo_ro�ilo o odsotnosti:"
 
-#: src/protocols/oscar/oscar.c:6560
-msgid "Unable to set AIM away message."
-msgstr "Sporo�ila za odsotnost za protokol AIM ni bilo mogo�e nastaviti."
-
-#: src/protocols/oscar/oscar.c:6561
-msgid ""
-"You have probably requested to set your away message before the login "
-"procedure completed.  You remain in a \"present\" state; try setting it "
-"again when you are fully connected."
-msgstr ""
-"Verjetno ste hoteli nastaviti sporo�ilo o odsotnosti preden se je kon�alo "
-"prijavljanje. Va邸e stanje ostaja nespremenjeno. Poskusite ponovno, ko ste "
-"zagotovo prijavljeni."
-
-#: src/protocols/oscar/oscar.c:6691
-#, c-format
-msgid ""
-"Could not add the buddy %s because the screen name is invalid.  Screen names "
-"must either start with a letter and contain only letters, numbers and "
-"spaces, or contain only numbers."
-msgstr ""
-"Ni mogo�e dodati prijatelja %s, ker vzdevek ni veljaven. Vzdevki se morajo "
-"za�eti s �rko, vsebujejo lahko le �rke, 邸tevilke in presledke, lahko pa so "
-"tudi sestavljeni iz samih 邸tevil."
-
-#: src/protocols/oscar/oscar.c:6693 src/protocols/oscar/oscar.c:7092
-#: src/protocols/oscar/oscar.c:7106 src/protocols/simple/simple.c:203
+#: src/protocols/oscar/oscar.c:6718
+#, c-format
+msgid "Could not add the buddy %s because the screen name is invalid.  Screen names must either start with a letter and contain only letters, numbers and spaces, or contain only numbers."
+msgstr "Ni mogo�e dodati prijatelja %s, ker vzdevek ni veljaven. Vzdevki se morajo za�eti s �rko, vsebujejo lahko le �rke, 邸tevilke in presledke, lahko pa so tudi sestavljeni iz samih 邸tevil."
+
+#: src/protocols/oscar/oscar.c:6720
+#: src/protocols/oscar/oscar.c:7118
+#: src/protocols/oscar/oscar.c:7132
+#: src/protocols/simple/simple.c:203
 msgid "Unable To Add"
 msgstr "Nemogo�e dodati"
 
-#: src/protocols/oscar/oscar.c:6798
+#: src/protocols/oscar/oscar.c:6825
 msgid "Unable To Retrieve Buddy List"
 msgstr "Seznama prijateljev ni bilo mogo�e pridobiti"
 
-#: src/protocols/oscar/oscar.c:6799
-msgid ""
-"Gaim was temporarily unable to retrieve your buddy list from the AIM "
-"servers.  Your buddy list is not lost, and will probably become available in "
-"a few hours."
-msgstr ""
-"Gaim za�asno ni uspel pridobiti va邸ega seznama prijateljev z AIM stre転nikov. "
-"Va邸 seznam prijateljev ni izgubljen, verjetno pa bo postal dosegljiv v nekaj "
-"urah."
-
-#: src/protocols/oscar/oscar.c:6983 src/protocols/oscar/oscar.c:6984
-#: src/protocols/oscar/oscar.c:6989 src/protocols/oscar/oscar.c:7150
-#: src/protocols/oscar/oscar.c:7151 src/protocols/oscar/oscar.c:7156
+#: src/protocols/oscar/oscar.c:6826
+msgid "Gaim was temporarily unable to retrieve your buddy list from the AIM servers.  Your buddy list is not lost, and will probably become available in a few hours."
+msgstr "Gaim za�asno ni uspel pridobiti va邸ega seznama prijateljev z AIM stre転nikov. Va邸 seznam prijateljev ni izgubljen, verjetno pa bo postal dosegljiv v nekaj urah."
+
+#: src/protocols/oscar/oscar.c:7016
+#: src/protocols/oscar/oscar.c:7017
+#: src/protocols/oscar/oscar.c:7022
+#: src/protocols/oscar/oscar.c:7176
+#: src/protocols/oscar/oscar.c:7177
+#: src/protocols/oscar/oscar.c:7182
 msgid "Orphans"
 msgstr "Sirote"
 
-#: src/protocols/oscar/oscar.c:7090
-#, c-format
-msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
-"list.  Please remove one and try again."
-msgstr ""
-"Prijatelja %s ni bilo mogo�e dodati, ker imate na seznamu preve� "
-"prijateljev. Prosim odstranite enega in poskusite ponovno."
-
-#: src/protocols/oscar/oscar.c:7090 src/protocols/oscar/oscar.c:7104
+#: src/protocols/oscar/oscar.c:7116
+#, c-format
+msgid "Could not add the buddy %s because you have too many buddies in your buddy list.  Please remove one and try again."
+msgstr "Prijatelja %s ni bilo mogo�e dodati, ker imate na seznamu preve� prijateljev. Prosim odstranite enega in poskusite ponovno."
+
+#: src/protocols/oscar/oscar.c:7116
+#: src/protocols/oscar/oscar.c:7130
 msgid "(no name)"
 msgstr "(brez imena)"
 
-#: src/protocols/oscar/oscar.c:7104
-#, c-format
-msgid ""
-"Could not add the buddy %s for an unknown reason.  The most common reason "
-"for this is that you have the maximum number of allowed buddies in your "
-"buddy list."
-msgstr ""
-"Prijatelja %s iz neznanega razloga ni bilo mogo�e dodati na seznam. "
-"Najpogostej邸i razlog za to je preveliko 邸tevilo prijateljev na va邸em seznamu."
-
-#: src/protocols/oscar/oscar.c:7187
-#, c-format
-msgid ""
-"The user %s has given you permission to add you to their buddy list.  Do you "
-"want to add them?"
-msgstr ""
-"Uporabnik %s vam je dovolil, da ga dodate na svoj seznam prijateljev. Ali ga "
-"転elite dodati?"
-
-#: src/protocols/oscar/oscar.c:7193
+#: src/protocols/oscar/oscar.c:7130
+#, c-format
+msgid "Could not add the buddy %s for an unknown reason.  The most common reason for this is that you have the maximum number of allowed buddies in your buddy list."
+msgstr "Prijatelja %s iz neznanega razloga ni bilo mogo�e dodati na seznam. Najpogostej邸i razlog za to je preveliko 邸tevilo prijateljev na va邸em seznamu."
+
+#: src/protocols/oscar/oscar.c:7213
+#, c-format
+msgid "The user %s has given you permission to add you to their buddy list.  Do you want to add them?"
+msgstr "Uporabnik %s vam je dovolil, da ga dodate na svoj seznam prijateljev. Ali ga 転elite dodati?"
+
+#: src/protocols/oscar/oscar.c:7219
 msgid "Authorization Given"
 msgstr "Pooblastilo odobreno"
 
-#: src/protocols/oscar/oscar.c:7237
+#: src/protocols/oscar/oscar.c:7263
 #, c-format
 msgid ""
 "The user %s wants to add %s to their buddy list for the following reason:\n"
 "%s"
 msgstr ""
-"Uporabnik %s 転eli dodati %s na svoj seznam prijateljev iz naslednjega "
-"razloga:\n"
+"Uporabnik %s 転eli dodati %s na svoj seznam prijateljev iz naslednjega razloga:\n"
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:7282
+#: src/protocols/oscar/oscar.c:7308
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
-msgstr ""
-"Uporabnik %s je odobril zahtevo, da ga dodate na svoj seznam prijateljev."
-
-#: src/protocols/oscar/oscar.c:7283
+msgstr "Uporabnik %s je odobril zahtevo, da ga dodate na svoj seznam prijateljev."
+
+#: src/protocols/oscar/oscar.c:7309
 msgid "Authorization Granted"
 msgstr "Pooblastilo odobreno"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:7286
+#: src/protocols/oscar/oscar.c:7312
 #, c-format
 msgid ""
-"The user %s has denied your request to add them to your buddy list for the "
-"following reason:\n"
+"The user %s has denied your request to add them to your buddy list for the following reason:\n"
 "%s"
 msgstr ""
-"Uporabnik %s je zavrnil va邸o zahtevo, da ga dodate na svoj seznam "
-"prijateljev, ker:\n"
+"Uporabnik %s je zavrnil va邸o zahtevo, da ga dodate na svoj seznam prijateljev, ker:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:7287
+#: src/protocols/oscar/oscar.c:7313
 msgid "Authorization Denied"
 msgstr "Pooblastilo zavrnjeno"
 
-#: src/protocols/oscar/oscar.c:7324 src/protocols/toc/toc.c:1372
+#: src/protocols/oscar/oscar.c:7350
+#: src/protocols/toc/toc.c:1372
 msgid "_Exchange:"
 msgstr "_Izmenjaj:"
 
-#: src/protocols/oscar/oscar.c:7360
+#: src/protocols/oscar/oscar.c:7386
 msgid "Invalid chat name specified."
 msgstr "Navedeno je neveljavno ime pomenka."
 
-#: src/protocols/oscar/oscar.c:7430
+#: src/protocols/oscar/oscar.c:7456
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
-msgstr ""
-"Va邸a slika IM ni bila poslana. Slik IM ne morete po邸iljati v klepetih AIM."
-
-#: src/protocols/oscar/oscar.c:7565
+msgstr "Va邸a slika IM ni bila poslana. Slik IM ne morete po邸iljati v klepetih AIM."
+
+#. Available status messages are plain text
+#: src/protocols/oscar/oscar.c:7590
+msgid "Status Message"
+msgstr "Sporo�ilo o stanju"
+
+#: src/protocols/oscar/oscar.c:7599
+#: src/protocols/sametime/sametime.c:5240
 msgid "Away Message"
 msgstr "Sporo�ilo o odsotnosti"
 
-#: src/protocols/oscar/oscar.c:7854
+#: src/protocols/oscar/oscar.c:7888
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Komentar o prijatelju %s"
 
-#: src/protocols/oscar/oscar.c:7855
+#: src/protocols/oscar/oscar.c:7889
 msgid "Buddy Comment:"
 msgstr "Komentar prijatelja:"
 
-#: src/protocols/oscar/oscar.c:7874
+#: src/protocols/oscar/oscar.c:7908
 msgid "Edit Buddy Comment"
 msgstr "Uredi komentar prijatelja"
 
-#: src/protocols/oscar/oscar.c:7880
+#: src/protocols/oscar/oscar.c:7914
 msgid "Get Status Msg"
 msgstr "Poizvedi o stanju"
 
-#: src/protocols/oscar/oscar.c:7892
+#: src/protocols/oscar/oscar.c:7926
 msgid "Direct IM"
 msgstr "Neposredni pogovor"
 
-#: src/protocols/oscar/oscar.c:7909
+#: src/protocols/oscar/oscar.c:7943
 msgid "Re-request Authorization"
 msgstr "Ponovno zahtevaj pooblastilo"
 
-#: src/protocols/oscar/oscar.c:7969
+#: src/protocols/oscar/oscar.c:8003
 msgid "Require authorization"
 msgstr "Zahtevaj pooblastilo"
 
-#: src/protocols/oscar/oscar.c:7972
+#: src/protocols/oscar/oscar.c:8006
 msgid "Hide IP address"
 msgstr "Skrij naslov IP"
 
-#: src/protocols/oscar/oscar.c:7975
+#: src/protocols/oscar/oscar.c:8009
 msgid "Web aware"
 msgstr "Spletno zaveden"
 
-#: src/protocols/oscar/oscar.c:7980
+#: src/protocols/oscar/oscar.c:8014
 msgid "ICQ Privacy Options"
 msgstr "Mo転nosti zasebnosti ICQ"
 
-#: src/protocols/oscar/oscar.c:7997
+#: src/protocols/oscar/oscar.c:8031
 msgid "The new formatting is invalid."
 msgstr "Oblika novega zapisa je neveljavna."
 
-#: src/protocols/oscar/oscar.c:7998
+#: src/protocols/oscar/oscar.c:8032
 msgid "Screen name formatting can change only capitalization and whitespace."
-msgstr ""
-"Z oblikovanjem vzdevka lahko spreminjate samo velike �rke in presledke."
-
-#: src/protocols/oscar/oscar.c:8005
+msgstr "Z oblikovanjem vzdevka lahko spreminjate samo velike �rke in presledke."
+
+#: src/protocols/oscar/oscar.c:8039
 msgid "New screen name formatting:"
 msgstr "Nov vzdevek za oblikovanje:"
 
-#: src/protocols/oscar/oscar.c:8057
+#: src/protocols/oscar/oscar.c:8091
 msgid "Change Address To:"
 msgstr "Spremeni naslov v:"
 
-#: src/protocols/oscar/oscar.c:8102
+#: src/protocols/oscar/oscar.c:8136
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>ne �akate na pooblastilo</i>"
 
-#: src/protocols/oscar/oscar.c:8105
+#: src/protocols/oscar/oscar.c:8139
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Pri�akujete pooblastila od naslednjih prijateljev"
 
-#: src/protocols/oscar/oscar.c:8106
-msgid ""
-"You can re-request authorization from these buddies by right-clicking on "
-"them and selecting \"Re-request Authorization.\""
-msgstr ""
-"�e 転elite, lahko ponovno zahtevate pooblastilo od teh prijateljev, tako da "
-"desno kliknete na njih in izberete \"Ponovno zahtevaj pooblastilo.\""
-
-#: src/protocols/oscar/oscar.c:8123
+#: src/protocols/oscar/oscar.c:8140
+msgid "You can re-request authorization from these buddies by right-clicking on them and selecting \"Re-request Authorization.\""
+msgstr "�e 転elite, lahko ponovno zahtevate pooblastilo od teh prijateljev, tako da desno kliknete na njih in izberete \"Ponovno zahtevaj pooblastilo.\""
+
+#: src/protocols/oscar/oscar.c:8157
 msgid "Find Buddy by E-mail"
 msgstr "Najdi prijatelja po e-po邸ti"
 
-#: src/protocols/oscar/oscar.c:8124
+#: src/protocols/oscar/oscar.c:8158
 msgid "Search for a buddy by e-mail address"
 msgstr "I邸�i prijatelje po naslovu e-po邸te"
 
-#: src/protocols/oscar/oscar.c:8125
+#: src/protocols/oscar/oscar.c:8159
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Vnesite naslov e-po邸te prijatelja, ki ga 転elite najti"
 
-#: src/protocols/oscar/oscar.c:8212 src/protocols/silc/silc.c:817
+#: src/protocols/oscar/oscar.c:8246
+#: src/protocols/silc/silc.c:1009
 msgid "Set User Info..."
 msgstr "Nastavi informacije o uporabniku ..."
 
-#: src/protocols/oscar/oscar.c:8218
+#: src/protocols/oscar/oscar.c:8252
 msgid "Set User Info (URL)..."
 msgstr "Nastavi informacije o uporabniku (URL) ..."
 
-#: src/protocols/oscar/oscar.c:8223 src/protocols/silc/silc.c:813
+#: src/protocols/oscar/oscar.c:8257
+#: src/protocols/silc/silc.c:1005
 msgid "Change Password..."
 msgstr "Spremeni geslo ..."
 
-#: src/protocols/oscar/oscar.c:8229
+#: src/protocols/oscar/oscar.c:8263
 msgid "Change Password (URL)"
 msgstr "Spremeni geslo (URL povezava)"
 
-#: src/protocols/oscar/oscar.c:8233
+#: src/protocols/oscar/oscar.c:8267
 msgid "Configure IM Forwarding (URL)"
 msgstr "Nastavi posredovanje sporo�il (URL)"
 
 #. ICQ actions
-#: src/protocols/oscar/oscar.c:8243
+#: src/protocols/oscar/oscar.c:8277
 msgid "Show privacy options..."
 msgstr "Poka転i mo転nosti zasebnosti ..."
 
 #. AIM actions
-#: src/protocols/oscar/oscar.c:8250
+#: src/protocols/oscar/oscar.c:8284
 msgid "Format Screen Name..."
 msgstr "Oblikuj vzdevek ..."
 
-#: src/protocols/oscar/oscar.c:8254
+#: src/protocols/oscar/oscar.c:8288
 msgid "Confirm Account"
 msgstr "Potrdi ra�un"
 
-#: src/protocols/oscar/oscar.c:8258
+#: src/protocols/oscar/oscar.c:8292
 msgid "Display Currently Registered Address"
 msgstr "Prika転i trenutno registriran naslov"
 
-#: src/protocols/oscar/oscar.c:8262
+#: src/protocols/oscar/oscar.c:8296
 msgid "Change Currently Registered Address..."
 msgstr "Spremeni trenutno registriran naslov ..."
 
-#: src/protocols/oscar/oscar.c:8269
+#: src/protocols/oscar/oscar.c:8303
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Poka転i prijatelje, ki �akajo na pooblastilo"
 
-#: src/protocols/oscar/oscar.c:8275
+#: src/protocols/oscar/oscar.c:8309
 msgid "Search for Buddy by Email..."
 msgstr "I邸�i prijatelja po e-po邸ti ..."
 
-#: src/protocols/oscar/oscar.c:8280
+#: src/protocols/oscar/oscar.c:8314
 msgid "Search for Buddy by Information"
 msgstr "I邸�i prijatelja po informaciji"
 
-#: src/protocols/oscar/oscar.c:8350
+#: src/protocols/oscar/oscar.c:8384
 msgid "Use recent buddies group"
 msgstr "Uporabi skupino zadnjih prijateljev"
 
-#: src/protocols/oscar/oscar.c:8353
+#: src/protocols/oscar/oscar.c:8387
 msgid "Show how long you have been idle"
 msgstr "Prika転i �as lastne neaktivnosti"
 
-#: src/protocols/oscar/oscar.c:8362
+#: src/protocols/oscar/oscar.c:8396
 msgid "Use AIM/ICQ proxy server (Slower/More Secure/Usually Works)"
 msgstr "Uporabi stre転nik proxy AIM/ICQ (po�asneje/varnej邸e/ponavadi deluje)"
 
@@ -8875,186 +9363,501 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:8476 src/protocols/oscar/oscar.c:8478
+#: src/protocols/oscar/oscar.c:8513
+#: src/protocols/oscar/oscar.c:8515
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "Vstavek za protokol AIM/ICQ"
 
-#: src/protocols/oscar/oscar.c:8497
+#: src/protocols/oscar/oscar.c:8534
 msgid "Auth host"
 msgstr "Stre転nik za avtentikacijo"
 
-#: src/protocols/oscar/oscar.c:8500
+#: src/protocols/oscar/oscar.c:8537
 msgid "Auth port"
 msgstr "Vrata za avtentikacijo"
 
-#: src/protocols/oscar/oscar.c:8503 src/protocols/zephyr/zephyr.c:2892
+#: src/protocols/oscar/oscar.c:8540
+#: src/protocols/zephyr/zephyr.c:2893
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: src/protocols/sametime/sametime.c:1134
-#, fuzzy
+#: src/protocols/sametime/sametime.c:362
+msgid "Connection closed (writing)"
+msgstr "Povezava zaprta (pisanje)"
+
+#: src/protocols/sametime/sametime.c:1270
+#, c-format
+msgid "<b>Group Title:</b> %s<br>"
+msgstr "<b>Ime skupine:</b> %s<br>"
+
+#: src/protocols/sametime/sametime.c:1271
+#, c-format
+msgid "<b>Notes Group ID:</b> %s<br>"
+msgstr "<b>ID skupine zapiskov:</b> %s<br>"
+
+#: src/protocols/sametime/sametime.c:1273
+#, c-format
+msgid "Info for Group %s"
+msgstr "Podatki za skupino %s"
+
+#: src/protocols/sametime/sametime.c:1275
+msgid "Notes Address Book Information"
+msgstr "Informacije o adresarju zapiskov"
+
+#: src/protocols/sametime/sametime.c:1307
+msgid "Invite Group to Conference..."
+msgstr "Povabi skupino na konferen�ni pogovor ..."
+
+#: src/protocols/sametime/sametime.c:1316
+msgid "Get Notes Address Book Info"
+msgstr "Pridobi podatke o adresarju zapiskov"
+
+#: src/protocols/sametime/sametime.c:1437
 msgid "Sending Handshake"
-msgstr "Po邸ljanje pi邸kotka"
-
-#: src/protocols/sametime/sametime.c:1139
-#, fuzzy
+msgstr "Po邸ljanje rokovanja"
+
+#: src/protocols/sametime/sametime.c:1442
 msgid "Waiting for Handshake Acknowledgement"
-msgstr "�akanje na za�etek prenosa"
-
-#: src/protocols/sametime/sametime.c:1144
+msgstr "�akanje na potrditev rokovanja"
+
+#: src/protocols/sametime/sametime.c:1447
 msgid "Handshake Acknowledged, Sending Login"
-msgstr ""
-
-#: src/protocols/sametime/sametime.c:1149
+msgstr "Rokovanje potrjeno, po邸iljanje prijave"
+
+#: src/protocols/sametime/sametime.c:1452
 msgid "Waiting for Login Acknowledgement"
-msgstr ""
-
-#: src/protocols/sametime/sametime.c:1154
-#, fuzzy
+msgstr "�akanje na potrditev prijave"
+
+#: src/protocols/sametime/sametime.c:1457
 msgid "Login Redirected"
-msgstr "Prijavni stre転nik"
-
-#: src/protocols/sametime/sametime.c:1159
-#, fuzzy
+msgstr "Prijava preusmerjena"
+
+#: src/protocols/sametime/sametime.c:1463
 msgid "Forcing Login"
-msgstr "Prijavljanje"
-
-#: src/protocols/sametime/sametime.c:1163
+msgstr "Prisilno prijavljanje"
+
+#: src/protocols/sametime/sametime.c:1467
 msgid "Login Acknowledged"
-msgstr ""
-
-#: src/protocols/sametime/sametime.c:1168
-#, fuzzy
+msgstr "Prijava potrjena"
+
+#: src/protocols/sametime/sametime.c:1472
 msgid "Connected to Sametime Community Server"
-msgstr "Povezovanjes stre転nikom SILC"
+msgstr "Povezani s stre転nikom Sametime Community Server"
 
 #. * @todo Admin alerts should probably be in a conversation window
 #. rather than a gaim_notify_message. Or in some sort of updating
 #. dialog, or something.
-#: src/protocols/sametime/sametime.c:1263
+#: src/protocols/sametime/sametime.c:1566
 msgid "Admin Alert"
+msgstr "Skrbni邸ki alarm"
+
+#: src/protocols/sametime/sametime.c:1623
+msgid "Connection reset"
+msgstr "Povezava ponovno nastavljena"
+
+#: src/protocols/sametime/sametime.c:1630
+#, c-format
+msgid "Error reading from socket: %s"
+msgstr "Napaka pri branju iz vti�nice: %s"
+
+#. this is a regular connect, error out
+#: src/protocols/sametime/sametime.c:1659
+#: src/protocols/sametime/sametime.c:3650
+msgid "Unable to connect to host"
+msgstr "Ni se bilo mogo�e povezati na stre転nik."
+
+#: src/protocols/sametime/sametime.c:1698
+#, c-format
+msgid "Announcement from %s"
+msgstr "Oznanilo od %s"
+
+#: src/protocols/sametime/sametime.c:1869
+msgid "Conference Closed"
+msgstr "Konferen�ni pogovor zaprt"
+
+#  Data is assumed to be the destination sn
+#: src/protocols/sametime/sametime.c:2330
+msgid "Unable to send message: "
+msgstr "Ni bilo mo� poslati sporo�ila: "
+
+#: src/protocols/sametime/sametime.c:2937
+msgid "Place Closed"
+msgstr "Zaprto mesto"
+
+#: src/protocols/sametime/sametime.c:3224
+msgid "Microphone"
+msgstr "Mikrofon"
+
+#: src/protocols/sametime/sametime.c:3225
+msgid "Speakers"
+msgstr "Zvo�niki"
+
+#: src/protocols/sametime/sametime.c:3226
+msgid "Video Camera"
+msgstr "Videokamera"
+
+#: src/protocols/sametime/sametime.c:3230
+msgid "File Transfer"
+msgstr "Prenos datotek"
+
+#: src/protocols/sametime/sametime.c:3251
+#, c-format
+msgid ""
+"\n"
+"<b>Status</b>: %s"
 msgstr ""
-
-#: src/protocols/sametime/sametime.c:2758
-#, fuzzy
-msgid "Active"
-msgstr "Hiperaktiven"
-
-#: src/protocols/simple/simple.c:202
+"\n"
+"<b>Stanje</b>: %s"
+
+#: src/protocols/sametime/sametime.c:3256
+#, c-format
+msgid ""
+"\n"
+"<b>Message</b>: %s"
+msgstr ""
+"\n"
+"<b>Sporo�ilo:</b> %s"
+
+#: src/protocols/sametime/sametime.c:3262
 #, c-format
 msgid ""
-"Could not add the buddy %s because every simple user has to start with "
-"'sip:'."
+"\n"
+"<b>Supports</b>: %s"
+msgstr ""
+"\n"
+"<b>Podpira</b>: %s"
+
+#: src/protocols/sametime/sametime.c:3267
+msgid ""
+"\n"
+"<b>External User</b>"
 msgstr ""
-
-#: src/protocols/simple/simple.c:1209
-#, fuzzy
-msgid "Could not create listen socket"
-msgstr "Vti�nika ni bilo mogo�e ustvariti"
-
-#: src/protocols/simple/simple.c:1263
-#, fuzzy
-msgid "SIP usernames may not contain whitespaces or @ symbols"
-msgstr "IRC vzdevki ne smejo vsebovati presledka"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#: src/protocols/simple/simple.c:1408
-#, fuzzy
-msgid "SIP/SIMPLE Protocol Plugin"
-msgstr "Vstavek za protokol SILC"
-
-#. *  summary
-#: src/protocols/simple/simple.c:1409
-#, fuzzy
-msgid "The SIP/SIMPLE Protocol Plugin"
-msgstr "Vstavek za protokol SILC"
-
-#. *  description
-#: src/protocols/simple/simple.c:1410
-msgid "Thomas Butter <butter@uni-mannheim.de>"
+"\n"
+"<b>Zunanji uporabnik</b>"
+
+#: src/protocols/sametime/sametime.c:3285
+msgid "Active"
+msgstr "Aktiven"
+
+#: src/protocols/sametime/sametime.c:3374
+msgid "Create conference with user"
+msgstr "Ustvari konferen�ni pogovor z uporabnikom"
+
+#: src/protocols/sametime/sametime.c:3375
+#, c-format
+msgid "Please enter a topic for the new conference, and an invitation message to be sent to %s"
+msgstr "Vnesite temo za nov konferen�ni pogovor in sporo�ilo vabila za %s"
+
+#: src/protocols/sametime/sametime.c:3379
+msgid "New Conference"
+msgstr "Nov konferen�ni pogovor"
+
+#: src/protocols/sametime/sametime.c:3381
+msgid "Create"
+msgstr "Ustvari"
+
+#: src/protocols/sametime/sametime.c:3443
+msgid "Available Conferences"
+msgstr "Konferen�ni pogovori na voljo"
+
+#: src/protocols/sametime/sametime.c:3449
+msgid "Create New Conference..."
+msgstr "Ustvari nov konferen�ni pogovor ..."
+
+#: src/protocols/sametime/sametime.c:3456
+msgid "Invite user to a conference"
+msgstr "Povabi uporabnika na konferen�ni pogovor"
+
+#: src/protocols/sametime/sametime.c:3457
+#, c-format
+msgid "Select a conference from the list below to send an invite to user %s. Select \"Create New Conference\" if you'd like to create a new conference to invite this user to."
+msgstr "Iz spodnjega seznama izberite konferenco in po邸ljite povabilo uporabniku %s. Izberite \"Ustvari novo konferenco\", �e bi 転eleli ustvariti novo konferenco in k njej povabili uporabnika."
+
+#: src/protocols/sametime/sametime.c:3462
+msgid "Invite to Conference"
+msgstr "Povabi na konferen�ni pogovor"
+
+#: src/protocols/sametime/sametime.c:3464
+msgid "Invite"
+msgstr "Povabi"
+
+#: src/protocols/sametime/sametime.c:3516
+msgid "Invite to Conference..."
+msgstr "Povabi na konferen�ni pogovor ..."
+
+#: src/protocols/sametime/sametime.c:3562
+msgid "No Sametime Community Server specified"
+msgstr "Stre転nik Sametime Community ni naveden"
+
+#: src/protocols/sametime/sametime.c:3583
+#, c-format
+msgid "No host or IP address has been configured for the Meanwhile account %s. Please enter one below to continue logging in."
+msgstr "Za ra�un Meanwhile %s ni bil nastavljen noben gostitelj ali naslov IP. Za nadaljevanje prijave vnesite spodaj potrebne podatke. "
+
+#: src/protocols/sametime/sametime.c:3588
+msgid "Meanwhile Connection Setup"
+msgstr "Namestitev povezave Meanwhile"
+
+#: src/protocols/sametime/sametime.c:3589
+msgid "No Sametime Community Server Specified"
+msgstr "Stre転nik Sametime Community ni naveden"
+
+#: src/protocols/sametime/sametime.c:4046
+msgid "<b>External User</b><br>"
+msgstr "<b>Zunanji uporabnik</b><br>"
+
+#: src/protocols/sametime/sametime.c:4049
+#, c-format
+msgid "<b>User ID:</b> %s<br>"
+msgstr "<b>Uporabni邸ki ID:</b> %s<br>"
+
+#: src/protocols/sametime/sametime.c:4055
+#, c-format
+msgid "<b>Full Name:</b> %s<br>"
+msgstr "<b>Polno ime:</b> %s<br>"
+
+#: src/protocols/sametime/sametime.c:4061
+msgid "<b>Last Known Client:</b> "
+msgstr "<b>Zadnji� razpoznan odjemalec:</b> "
+
+#: src/protocols/sametime/sametime.c:4069
+#, c-format
+msgid "Unknown (0x%04x)<br>"
+msgstr "Neznano (0x%04x)<br>"
+
+#: src/protocols/sametime/sametime.c:4076
+#, c-format
+msgid "<b>Supports:</b> %s<br>"
+msgstr "<b>Podpira:</b> %s<br>"
+
+#: src/protocols/sametime/sametime.c:4082
+#, c-format
+msgid "<b>Status:</b> %s"
+msgstr "<b>Stanje</b>: %s"
+
+#: src/protocols/sametime/sametime.c:4323
+#: src/protocols/sametime/sametime.c:5447
+msgid "Possible Matches"
+msgstr "Mo転ni zadetki"
+
+#: src/protocols/sametime/sametime.c:4360
+msgid "An ambiguous user ID was entered"
+msgstr "Vnesli ste dvoumen uporabni邸ki ID"
+
+#: src/protocols/sametime/sametime.c:4361
+#, c-format
+msgid "The identifier '%s' may possibly refer to any of the following users. Please select the correct user from the list below to add them to your buddy list."
+msgstr "Imenovalec '%s' se morda nana邸a na vse na邸tete uporabnike. Izberite ustreznega in ga dodajte na seznam prijateljev."
+
+#: src/protocols/sametime/sametime.c:4366
+msgid "Select User to Add"
+msgstr "Izberite uporabnika, ki ga 転elite dodati"
+
+#: src/protocols/sametime/sametime.c:4368
+msgid "Add User"
+msgstr "Dodaj uporabnika"
+
+#: src/protocols/sametime/sametime.c:4429
+msgid "Unable to add user: user not found"
+msgstr "Ni bilo mo� dodati uporabnika: ni ga mogo�e najti"
+
+#: src/protocols/sametime/sametime.c:4431
+#, c-format
+msgid "The identifier '%s' did not match any users in your Sametime community. This entry has been removed from your buddy list."
+msgstr "Imenovalec '%s' se ne ujema z nobenim uporabnikom v va邸i skupnosti Sametime. Ta vnos je bil odstranjen iz va邸ega seznama prijateljev."
+
+#: src/protocols/sametime/sametime.c:4436
+msgid "Unable to add user"
+msgstr "Ni mogo�e dodati uporabnika"
+
+#: src/protocols/sametime/sametime.c:5006
+#, c-format
+msgid ""
+"Error reading file %s: \n"
+"%s\n"
 msgstr ""
-
-#: src/protocols/simple/simple.c:1431
-msgid "Publish Status (note: everyone may watch you)"
-msgstr ""
-
-#: src/protocols/simple/simple.c:1434
-#, fuzzy
-msgid "Use UDP"
-msgstr "Uporabni邸ka 邸t."
-
-#: src/protocols/simple/simple.c:1436
-#, fuzzy
-msgid "Use Proxy"
-msgstr "brez stre転nika proxy"
-
-#: src/protocols/simple/simple.c:1438
-#, fuzzy
-msgid "Proxy"
-msgstr "brez stre転nika proxy"
-
-#: src/protocols/silc/buddy.c:51 src/protocols/silc/buddy.c:419
-#: src/protocols/silc/buddy.c:544 src/protocols/silc/buddy.c:711
+"Napaka pri branju datoteke %s: \n"
+"%s.\n"
+
+#: src/protocols/sametime/sametime.c:5132
+msgid "Remotely Stored Buddy List"
+msgstr "Oddaljeno shranjeni seznam prijateljev"
+
+#: src/protocols/sametime/sametime.c:5137
+msgid "Buddy List Storage Mode"
+msgstr "Na�in hrambe seznama prijateljev"
+
+#: src/protocols/sametime/sametime.c:5140
+msgid "Local Buddy List Only"
+msgstr "Le krajevni seznam prijateljev"
+
+#: src/protocols/sametime/sametime.c:5142
+msgid "Merge List from Server"
+msgstr "Spoji seznam prijateljev s stre転nikovim"
+
+#: src/protocols/sametime/sametime.c:5144
+msgid "Merge and Save List to Server"
+msgstr "Spoji seznam prijateljev s stre転nikovim in ga shrani"
+
+#: src/protocols/sametime/sametime.c:5146
+msgid "Synchronize List with Server"
+msgstr "Sinhroniziraj seznam s stre転nikom"
+
+#: src/protocols/sametime/sametime.c:5234
+msgid "Active Message"
+msgstr "Sporo�ilo o aktivnosti"
+
+#: src/protocols/sametime/sametime.c:5246
+msgid "Busy Message"
+msgstr "Sporo�ilo o zasedenosti"
+
+#: src/protocols/sametime/sametime.c:5250
+msgid "Default status messages"
+msgstr "Privzeta sporo�ila o stanju"
+
+#: src/protocols/sametime/sametime.c:5253
+msgid "Edit Status Messages"
+msgstr "Uredi sporo�ila o stanju"
+
+#: src/protocols/sametime/sametime.c:5296
+#, c-format
+msgid "Import Sametime List for Account %s"
+msgstr "Uvozi seznam Sametime za ra�un %s"
+
+#: src/protocols/sametime/sametime.c:5335
+#, c-format
+msgid "Export Sametime List for Account %s"
+msgstr "Izvozi seznam Sametime za ra�un %s"
+
+#: src/protocols/sametime/sametime.c:5386
+msgid "Unable to add group: group exists"
+msgstr "Skupine ni bilo mogo�e dodati: 転e obstaja"
+
+#: src/protocols/sametime/sametime.c:5387
+#, c-format
+msgid "A group named '%s' already exists in your buddy list."
+msgstr "Skupina z imenom '%s' 転e obstaja v va邸em seznamu prijateljev."
+
+#: src/protocols/sametime/sametime.c:5390
+#: src/protocols/sametime/sametime.c:5515
+msgid "Unable to add group"
+msgstr "Skupine ni mogo�e dodati"
+
+#: src/protocols/sametime/sametime.c:5463
+msgid "Notes Address Book group results"
+msgstr "Skupinski rezultati adresarjev zapiskov"
+
+#: src/protocols/sametime/sametime.c:5464
+#, c-format
+msgid "The identifier '%s' may possibly refer to any of the following Notes Address Book groups. Please select the correct group from the list below to add it to your buddy list."
+msgstr "Imenovalec '%s' se morda nana邸a na eno od naslednjih skupin adresarjev zapiskov. Izberite pravo skupino s spodnjega seznama in ga dodajte v svoj seznam prijateljev."
+
+#: src/protocols/sametime/sametime.c:5469
+msgid "Select Notes Address Book"
+msgstr "Izberite adresar zapiskov"
+
+#: src/protocols/sametime/sametime.c:5509
+msgid "Unable to add group: group not found"
+msgstr "Dodajanje skupine ni uspelo: skupina ne obstaja"
+
+#: src/protocols/sametime/sametime.c:5511
+#, c-format
+msgid "The identifier '%s' did not match any Notes Address Book groups in your Sametime community."
+msgstr "Imenovalec '%s' se ne ujema z nobeno skupino adresarjev zapiskov v va邸i skupnosti Sametime."
+
+#: src/protocols/sametime/sametime.c:5551
+msgid "Notes Address Book Group"
+msgstr "Skupina adresarja zapiskov"
+
+#: src/protocols/sametime/sametime.c:5552
+msgid "Enter the name of a Notes Address Book group in the field below to add the group and its members to your buddy list."
+msgstr "Vnesite ime skupine opomb adresarja v spodnje polje, s �imer boste lahko v seznam prijateljev vnesli skupino in njene �lane."
+
+#: src/protocols/sametime/sametime.c:5567
+msgid "Set Status Messages..."
+msgstr "Nastavi sporo�ila o stanju ..."
+
+#: src/protocols/sametime/sametime.c:5571
+msgid "Import Sametime List..."
+msgstr "Uvozi seznam Sametime ..."
+
+#: src/protocols/sametime/sametime.c:5575
+msgid "Export Sametime List..."
+msgstr "Izvozi seznam Sametime ..."
+
+#: src/protocols/sametime/sametime.c:5579
+msgid "Add Notes Address Book Group..."
+msgstr "Dodaj skupino adresarja zapiskov ..."
+
+#. notesbuddy hack encoding
+#: src/protocols/sametime/sametime.c:5673
+msgid "NotesBuddy Encoding"
+msgstr "Kodiranje NotesBuddy"
+
+#: src/protocols/sametime/sametime.c:5682
+msgid "Force Login (Ignore Server Redirects)"
+msgstr "Prisilna prijava (prezri stre転ni邸ke preusmeritve)"
+
+#: src/protocols/silc/buddy.c:52
+#: src/protocols/silc/buddy.c:420
+#: src/protocols/silc/buddy.c:545
+#: src/protocols/silc/buddy.c:712
 #: src/protocols/silc/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "Uporabnik %s ni prisoten v omre転ju"
 
-#: src/protocols/silc/buddy.c:52 src/protocols/silc/buddy.c:114
-#: src/protocols/silc/buddy.c:119 src/protocols/silc/buddy.c:123
-#: src/protocols/silc/buddy.c:128 src/protocols/silc/buddy.c:133
-#: src/protocols/silc/buddy.c:138 src/protocols/silc/buddy.c:256
+#: src/protocols/silc/buddy.c:53
+#: src/protocols/silc/buddy.c:115
+#: src/protocols/silc/buddy.c:120
+#: src/protocols/silc/buddy.c:124
+#: src/protocols/silc/buddy.c:129
+#: src/protocols/silc/buddy.c:134
+#: src/protocols/silc/buddy.c:139
+#: src/protocols/silc/buddy.c:257
 msgid "Key Agreement"
 msgstr "Pogodba"
 
-#: src/protocols/silc/buddy.c:53
+#: src/protocols/silc/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr "Ni mogo�e izvesti pogodbe"
 
-#: src/protocols/silc/buddy.c:115
+#: src/protocols/silc/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr "Pri邸lo je do napake med pogodbo"
 
-#: src/protocols/silc/buddy.c:119
+#: src/protocols/silc/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "Pogodba spodletela"
 
-#: src/protocols/silc/buddy.c:124
+#: src/protocols/silc/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr "�asovna omejitev med pogodbo potekla"
 
-#: src/protocols/silc/buddy.c:129
+#: src/protocols/silc/buddy.c:130
 msgid "Key agreement was aborted"
 msgstr "Pogodba je bila preklicana"
 
-#: src/protocols/silc/buddy.c:134
+#: src/protocols/silc/buddy.c:135
 msgid "Key agreement is already started"
 msgstr "Pogodba se je 転e za�ela"
 
-#: src/protocols/silc/buddy.c:139
+#: src/protocols/silc/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr "Pogodba se ne more za�eti z vami"
 
-#: src/protocols/silc/buddy.c:257 src/protocols/silc/buddy.c:387
-#: src/protocols/silc/buddy.c:512
+#: src/protocols/silc/buddy.c:258
+#: src/protocols/silc/buddy.c:388
+#: src/protocols/silc/buddy.c:513
 msgid "The remote user is not present in the network any more"
 msgstr "Oddaljen uporabnik ni ve� prisoten v omre転ju"
 
-#: src/protocols/silc/buddy.c:293
-#, c-format
-msgid ""
-"Key agreement request received from %s. Would you like to perform the key "
-"agreement?"
+#: src/protocols/silc/buddy.c:294
+#, c-format
+msgid "Key agreement request received from %s. Would you like to perform the key agreement?"
 msgstr "Zahteva po pogodbi sprejeta od %s. 貼elite izvesti pogodbo?"
 
-#: src/protocols/silc/buddy.c:297
+#: src/protocols/silc/buddy.c:298
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -9065,456 +9868,484 @@
 "Oddaljen gostitelj: %s\n"
 "Oddaljena vrata: %d"
 
-#: src/protocols/silc/buddy.c:310
+#: src/protocols/silc/buddy.c:311
 msgid "Key Agreement Request"
 msgstr "Zahteva pogodbe"
 
-#: src/protocols/silc/buddy.c:386 src/protocols/silc/buddy.c:421
-#: src/protocols/silc/buddy.c:463
+#: src/protocols/silc/buddy.c:387
+#: src/protocols/silc/buddy.c:422
+#: src/protocols/silc/buddy.c:464
 msgid "IM With Password"
 msgstr "IM z geslom"
 
-#: src/protocols/silc/buddy.c:422
+#: src/protocols/silc/buddy.c:423
 msgid "Cannot set IM key"
 msgstr "Ni mogo�e nastaviti klju�a IM"
 
-#: src/protocols/silc/buddy.c:464
+#: src/protocols/silc/buddy.c:465
 msgid "Set IM Password"
 msgstr "Nastavi geslo IM"
 
-#: src/protocols/silc/buddy.c:511 src/protocols/silc/buddy.c:546
-#: src/protocols/silc/ops.c:1278 src/protocols/silc/ops.c:1289
+#: src/protocols/silc/buddy.c:512
+#: src/protocols/silc/buddy.c:547
+#: src/protocols/silc/ops.c:1492
+#: src/protocols/silc/ops.c:1503
 msgid "Get Public Key"
 msgstr "Dobi javni klju�"
 
-#: src/protocols/silc/buddy.c:547 src/protocols/silc/ops.c:1279
-#: src/protocols/silc/ops.c:1290
+#: src/protocols/silc/buddy.c:548
+#: src/protocols/silc/ops.c:1493
+#: src/protocols/silc/ops.c:1504
 msgid "Cannot fetch the public key"
 msgstr "Javnega klju�a ni mogo�e dobiti"
 
-#: src/protocols/silc/buddy.c:634 src/protocols/silc/buddy.c:1583
+#: src/protocols/silc/buddy.c:635
+#: src/protocols/silc/buddy.c:1610
 msgid "Show Public Key"
 msgstr "Prika転i javni klju�"
 
-#: src/protocols/silc/buddy.c:635 src/protocols/silc/buddy.c:994
-#: src/protocols/silc/chat.c:235
+#: src/protocols/silc/buddy.c:636
+#: src/protocols/silc/buddy.c:995
+#: src/protocols/silc/chat.c:236
 msgid "Could not load public key"
 msgstr "Ni mogo�e nalo転iti javnega klju�a"
 
-#: src/protocols/silc/buddy.c:712 src/protocols/silc/ops.c:873
-#: src/protocols/silc/ops.c:945 src/protocols/silc/ops.c:1080
-#: src/protocols/silc/ops.c:1081 src/protocols/silc/ops.c:1099
+#: src/protocols/silc/buddy.c:713
+#: src/protocols/silc/ops.c:1087
+#: src/protocols/silc/ops.c:1159
+#: src/protocols/silc/ops.c:1294
+#: src/protocols/silc/ops.c:1295
+#: src/protocols/silc/ops.c:1313
 msgid "User Information"
 msgstr "Informacije o uporabniku"
 
-#: src/protocols/silc/buddy.c:713 src/protocols/silc/ops.c:946
-#: src/protocols/silc/ops.c:1100
+#: src/protocols/silc/buddy.c:714
+#: src/protocols/silc/ops.c:1160
+#: src/protocols/silc/ops.c:1314
 msgid "Cannot get user information"
 msgstr "Ni mogo�e dobiti informacij o uporabniku"
 
-#: src/protocols/silc/buddy.c:734
+#: src/protocols/silc/buddy.c:735
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "Prijatelj %s ni zaupljiv"
 
-#: src/protocols/silc/buddy.c:737
-msgid ""
-"You cannot receive buddy notifications until you import his/her public key.  "
-"You can use the Get Public Key command to get the public key."
-msgstr ""
-"Opozoril prijatelja ne morete sprejeti, dokler ne uvozite njegovega javnega "
-"klju�a.  Uporabite lahko ukaz Dobi javni klju�."
+#: src/protocols/silc/buddy.c:738
+msgid "You cannot receive buddy notifications until you import his/her public key.  You can use the Get Public Key command to get the public key."
+msgstr "Opozoril prijatelja ne morete sprejeti, dokler ne uvozite njegovega javnega klju�a.  Uporabite lahko ukaz Dobi javni klju�."
 
 #. Open file selector to select the public key.
-#: src/protocols/silc/buddy.c:1028
+#: src/protocols/silc/buddy.c:1029
 msgid "Open..."
 msgstr "Odpri ..."
 
-#: src/protocols/silc/buddy.c:1037
+#: src/protocols/silc/buddy.c:1038
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "Prijatelj %s ni prisoten v omre転ju"
 
-#: src/protocols/silc/buddy.c:1040
-msgid ""
-"To add the buddy you must import his/her public key. Press Import to import "
-"a public key."
-msgstr ""
-"�e 転elite dodati prijatelja, morate uvoziti njegov javni klju�. Kliknite "
-"Uvozi za uvoz javnega klju�a."
-
-#: src/protocols/silc/buddy.c:1043
+#: src/protocols/silc/buddy.c:1041
+msgid "To add the buddy you must import his/her public key. Press Import to import a public key."
+msgstr "�e 転elite dodati prijatelja, morate uvoziti njegov javni klju�. Kliknite Uvozi za uvoz javnega klju�a."
+
+#: src/protocols/silc/buddy.c:1044
 msgid "Import..."
 msgstr "Uvozi ..."
 
-#: src/protocols/silc/buddy.c:1130
+#: src/protocols/silc/buddy.c:1140
 msgid "Select correct user"
 msgstr "Izberite ustreznega uporabnika"
 
-#: src/protocols/silc/buddy.c:1132
-msgid ""
-"More than one user was found with the same public key. Select the correct "
-"user from the list to add to the buddy list."
-msgstr ""
-"Najden je bil ve� kot en uporabnik z enakim javnim klju�em. Izberite "
-"ustreznega in ga dodajte na seznam prijateljev."
-
-#: src/protocols/silc/buddy.c:1134
-msgid ""
-"More than one user was found with the same name. Select the correct user "
-"from the list to add to the buddy list."
-msgstr ""
-"Najden je bil ve� kot en uporabnik z enakim vzdevkom. Izberite ustreznega in "
-"ga dodajte na seznam prijateljev."
-
-#: src/protocols/silc/buddy.c:1415
+#: src/protocols/silc/buddy.c:1142
+msgid "More than one user was found with the same public key. Select the correct user from the list to add to the buddy list."
+msgstr "Najden je bil ve� kot en uporabnik z enakim javnim klju�em. Izberite ustreznega in ga dodajte na seznam prijateljev."
+
+#: src/protocols/silc/buddy.c:1144
+msgid "More than one user was found with the same name. Select the correct user from the list to add to the buddy list."
+msgstr "Najden je bil ve� kot en uporabnik z enakim vzdevkom. Izberite ustreznega in ga dodajte na seznam prijateljev."
+
+#: src/protocols/silc/buddy.c:1429
 msgid "Detached"
 msgstr "Odpeto"
 
-#: src/protocols/silc/buddy.c:1419 src/protocols/silc/silc.c:56
+#: src/protocols/silc/buddy.c:1433
+#: src/protocols/silc/silc.c:57
 msgid "Indisposed"
 msgstr "Neurejeno"
 
-#: src/protocols/silc/buddy.c:1423 src/protocols/silc/silc.c:58
+#: src/protocols/silc/buddy.c:1437
+#: src/protocols/silc/silc.c:59
 msgid "Wake Me Up"
 msgstr "Zbudi me"
 
-#: src/protocols/silc/buddy.c:1425 src/protocols/silc/silc.c:50
+#: src/protocols/silc/buddy.c:1439
+#: src/protocols/silc/silc.c:51
 msgid "Hyper Active"
 msgstr "Hiperaktiven"
 
-#: src/protocols/silc/buddy.c:1427
+#: src/protocols/silc/buddy.c:1441
 msgid "Robot"
 msgstr "Robot"
 
-#: src/protocols/silc/buddy.c:1434 src/protocols/silc/silc.c:634
-#: src/protocols/silc/util.c:472
+#: src/protocols/silc/buddy.c:1448
+#: src/protocols/silc/silc.c:658
+#: src/protocols/silc/util.c:473
 msgid "Happy"
 msgstr "Vesel"
 
-#: src/protocols/silc/buddy.c:1436 src/protocols/silc/silc.c:636
-#: src/protocols/silc/util.c:474
+#: src/protocols/silc/buddy.c:1450
+#: src/protocols/silc/silc.c:660
+#: src/protocols/silc/util.c:475
 msgid "Sad"
 msgstr "貼alosten"
 
-#: src/protocols/silc/buddy.c:1438 src/protocols/silc/silc.c:638
-#: src/protocols/silc/util.c:476
+#: src/protocols/silc/buddy.c:1452
+#: src/protocols/silc/silc.c:662
+#: src/protocols/silc/util.c:477
 msgid "Angry"
 msgstr "Jezen"
 
-#: src/protocols/silc/buddy.c:1440 src/protocols/silc/silc.c:640
-#: src/protocols/silc/util.c:478
+#: src/protocols/silc/buddy.c:1454
+#: src/protocols/silc/silc.c:664
+#: src/protocols/silc/util.c:479
 msgid "Jealous"
 msgstr "Ljubosumen"
 
-#: src/protocols/silc/buddy.c:1442 src/protocols/silc/silc.c:642
-#: src/protocols/silc/util.c:480
+#: src/protocols/silc/buddy.c:1456
+#: src/protocols/silc/silc.c:666
+#: src/protocols/silc/util.c:481
 msgid "Ashamed"
 msgstr "Osramo�en"
 
-#: src/protocols/silc/buddy.c:1444 src/protocols/silc/silc.c:644
-#: src/protocols/silc/util.c:482
+#: src/protocols/silc/buddy.c:1458
+#: src/protocols/silc/silc.c:668
+#: src/protocols/silc/util.c:483
 msgid "Invincible"
 msgstr "Nepremagljiv"
 
-#: src/protocols/silc/buddy.c:1446 src/protocols/silc/silc.c:646
-#: src/protocols/silc/util.c:484
+#: src/protocols/silc/buddy.c:1460
+#: src/protocols/silc/silc.c:670
+#: src/protocols/silc/util.c:485
 msgid "In Love"
 msgstr "Zaljubljen"
 
-#: src/protocols/silc/buddy.c:1448 src/protocols/silc/silc.c:648
-#: src/protocols/silc/util.c:486
+#: src/protocols/silc/buddy.c:1462
+#: src/protocols/silc/silc.c:672
+#: src/protocols/silc/util.c:487
 msgid "Sleepy"
 msgstr "Zaspan"
 
-#: src/protocols/silc/buddy.c:1450 src/protocols/silc/silc.c:650
-#: src/protocols/silc/util.c:488
+#: src/protocols/silc/buddy.c:1464
+#: src/protocols/silc/silc.c:674
+#: src/protocols/silc/util.c:489
 msgid "Bored"
 msgstr "Zdolgo�asen"
 
-#: src/protocols/silc/buddy.c:1452 src/protocols/silc/silc.c:652
-#: src/protocols/silc/util.c:490
+#: src/protocols/silc/buddy.c:1466
+#: src/protocols/silc/silc.c:676
+#: src/protocols/silc/util.c:491
 msgid "Excited"
 msgstr "Razburjen"
 
-#: src/protocols/silc/buddy.c:1454 src/protocols/silc/silc.c:654
-#: src/protocols/silc/util.c:492
+#: src/protocols/silc/buddy.c:1468
+#: src/protocols/silc/silc.c:678
+#: src/protocols/silc/util.c:493
 msgid "Anxious"
 msgstr "Vznemirjen"
 
-#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:982
+#: src/protocols/silc/buddy.c:1500
+#: src/protocols/silc/ops.c:1196
 msgid "User Modes"
 msgstr "Na�ini uporabnika"
 
-#: src/protocols/silc/buddy.c:1495 src/protocols/silc/ops.c:991
+#: src/protocols/silc/buddy.c:1509
+#: src/protocols/silc/ops.c:1205
 msgid "Mood"
 msgstr "Razpolo転enje"
 
-#: src/protocols/silc/buddy.c:1499 src/protocols/silc/ops.c:997
+#: src/protocols/silc/buddy.c:1513
+#: src/protocols/silc/ops.c:1211
 msgid "Status Text"
 msgstr "Besedilo stanja"
 
-#: src/protocols/silc/buddy.c:1504 src/protocols/silc/ops.c:1003
+#: src/protocols/silc/buddy.c:1518
+#: src/protocols/silc/ops.c:1217
 msgid "Preferred Contact"
 msgstr "Priljubljen stik"
 
-#: src/protocols/silc/buddy.c:1509 src/protocols/silc/ops.c:1008
+#: src/protocols/silc/buddy.c:1523
+#: src/protocols/silc/ops.c:1222
 msgid "Preferred Language"
 msgstr "Priljubljen jezik"
 
-#: src/protocols/silc/buddy.c:1514 src/protocols/silc/ops.c:1013
+#: src/protocols/silc/buddy.c:1528
+#: src/protocols/silc/ops.c:1227
 msgid "Device"
 msgstr "Naprava"
 
-#: src/protocols/silc/buddy.c:1519 src/protocols/silc/ops.c:1018
-#: src/protocols/silc/silc.c:702 src/protocols/silc/silc.c:704
+#: src/protocols/silc/buddy.c:1533
+#: src/protocols/silc/ops.c:1232
+#: src/protocols/silc/silc.c:726
+#: src/protocols/silc/silc.c:728
 msgid "Timezone"
 msgstr "�asovni pas"
 
-#: src/protocols/silc/buddy.c:1524 src/protocols/silc/ops.c:1023
+#: src/protocols/silc/buddy.c:1538
+#: src/protocols/silc/ops.c:1237
 msgid "Geolocation"
 msgstr "Lokacija"
 
-#: src/protocols/silc/buddy.c:1567
+#: src/protocols/silc/buddy.c:1594
 msgid "Reset IM Key"
 msgstr "Ponastavi klju� IM"
 
-#: src/protocols/silc/buddy.c:1572
+#: src/protocols/silc/buddy.c:1599
 msgid "IM with Key Exchange"
 msgstr "Pogovor z izmenjavo klju�ev"
 
-#: src/protocols/silc/buddy.c:1576
+#: src/protocols/silc/buddy.c:1603
 msgid "IM with Password"
 msgstr "Pogovor z geslom"
 
-#: src/protocols/silc/buddy.c:1588
+#: src/protocols/silc/buddy.c:1615
 msgid "Get Public Key..."
 msgstr "Dobi javni klju� ..."
 
-#: src/protocols/silc/buddy.c:1595 src/protocols/silc/ops.c:1409
+#: src/protocols/silc/buddy.c:1622
+#: src/protocols/silc/ops.c:1623
 msgid "Kill User"
 msgstr "Ubij uporabnika"
 
-#: src/protocols/silc/chat.c:38
+#: src/protocols/silc/buddy.c:1631
+#: src/protocols/silc/chat.c:971
+msgid "Draw On Whiteboard"
+msgstr "Ri邸i po tabli"
+
+#: src/protocols/silc/chat.c:39
 msgid "_Passphrase:"
 msgstr "_Geslo:"
 
-#: src/protocols/silc/chat.c:79
+#: src/protocols/silc/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "kanal %s ne obstaja v omre転ju"
 
-#: src/protocols/silc/chat.c:80 src/protocols/silc/chat.c:172
+#: src/protocols/silc/chat.c:81
+#: src/protocols/silc/chat.c:173
 msgid "Channel Information"
 msgstr "Informacije o kanalu"
 
-#: src/protocols/silc/chat.c:81
+#: src/protocols/silc/chat.c:82
 msgid "Cannot get channel information"
 msgstr "Ni mogo�e dobiti informacij o kanalu"
 
-#: src/protocols/silc/chat.c:118
+#: src/protocols/silc/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Ime kanala:</b> %s"
 
-#: src/protocols/silc/chat.c:121
+#: src/protocols/silc/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>�tevilo uporabnikov:</b> %d"
 
-#: src/protocols/silc/chat.c:128
+#: src/protocols/silc/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>Ustanovitelj kanala:</b> %s"
 
-#: src/protocols/silc/chat.c:137
+#: src/protocols/silc/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Cifra kanala:</b> %s"
 
-#: src/protocols/silc/chat.c:140
+#: src/protocols/silc/chat.c:141
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>HMAC kanala:</b> %s"
 
-#: src/protocols/silc/chat.c:145
+#: src/protocols/silc/chat.c:146
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Tema kanala:</b><br>%s"
 
-#: src/protocols/silc/chat.c:150
+#: src/protocols/silc/chat.c:151
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Na�ini kanala:</b> "
 
-#: src/protocols/silc/chat.c:163
+#: src/protocols/silc/chat.c:164
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Prstni odtis klju�a ustanovitelja:</b><br>%s"
 
-#: src/protocols/silc/chat.c:164
+#: src/protocols/silc/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Odtis klju�a ustanovitelja:</b><br>%s"
 
-#: src/protocols/silc/chat.c:234
+#: src/protocols/silc/chat.c:235
 msgid "Add Channel Public Key"
 msgstr "Dodaj javni klju� kanala"
 
 #. Add new public key
-#: src/protocols/silc/chat.c:289
+#: src/protocols/silc/chat.c:290
 msgid "Open Public Key..."
 msgstr "Odpri javni klju� ..."
 
-#: src/protocols/silc/chat.c:398
+#: src/protocols/silc/chat.c:399
 msgid "Channel Passphrase"
 msgstr "Geslo kanala"
 
-#: src/protocols/silc/chat.c:405
+#: src/protocols/silc/chat.c:406
 msgid "Channel Public Keys List"
 msgstr "Seznam javnih klju�ev kanala"
 
-#: src/protocols/silc/chat.c:410
-msgid ""
-"Channel authentication is used to secure the channel from unauthorized "
-"access. The authentication may be based on passphrase and digital "
-"signatures. If passphrase is set, it is required to be able to join. If "
-"channel public keys are set then only users whose public keys are listed are "
-"able to join."
-msgstr ""
-"Overovitev kanala slu転i obrambi kanala pred neavtoriziranim dostopom. "
-"Overovitev lahko temelji na geslih in digitalnih podpisih. �e je geslo "
-"nastavljeno, je potrebno za pridru転itev. �e so nastavljeni javni klju�i "
-"kanala, se mu lahko pridru転ijo le uporabniki, katerih klju�i so na seznamu."
-
-#: src/protocols/silc/chat.c:419 src/protocols/silc/chat.c:420
-#: src/protocols/silc/chat.c:457 src/protocols/silc/chat.c:458
-#: src/protocols/silc/chat.c:891
+#: src/protocols/silc/chat.c:411
+msgid "Channel authentication is used to secure the channel from unauthorized access. The authentication may be based on passphrase and digital signatures. If passphrase is set, it is required to be able to join. If channel public keys are set then only users whose public keys are listed are able to join."
+msgstr "Overovitev kanala slu転i obrambi kanala pred neavtoriziranim dostopom. Overovitev lahko temelji na geslih in digitalnih podpisih. �e je geslo nastavljeno, je potrebno za pridru転itev. �e so nastavljeni javni klju�i kanala, se mu lahko pridru転ijo le uporabniki, katerih klju�i so na seznamu."
+
+#: src/protocols/silc/chat.c:420
+#: src/protocols/silc/chat.c:421
+#: src/protocols/silc/chat.c:458
+#: src/protocols/silc/chat.c:459
+#: src/protocols/silc/chat.c:905
 msgid "Channel Authentication"
 msgstr "Overovitev kanala"
 
-#: src/protocols/silc/chat.c:421 src/protocols/silc/chat.c:459
+#: src/protocols/silc/chat.c:422
+#: src/protocols/silc/chat.c:460
 msgid "Add / Remove"
 msgstr "Dodaj / odstrani"
 
-#: src/protocols/silc/chat.c:576
+#: src/protocols/silc/chat.c:577
 msgid "Group Name"
 msgstr "Ime skupine"
 
-#: src/protocols/silc/chat.c:580 src/protocols/silc/ops.c:1694
+#: src/protocols/silc/chat.c:581
+#: src/protocols/silc/ops.c:1908
+#: src/protocols/silc/silc.c:934
 msgid "Passphrase"
 msgstr "Geslo"
 
-#: src/protocols/silc/chat.c:591
+#: src/protocols/silc/chat.c:592
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Vnesite ime zasebne skupine kanala %s in njeno geslo."
 
-#: src/protocols/silc/chat.c:593
+#: src/protocols/silc/chat.c:594
 msgid "Add Channel Private Group"
 msgstr "Dodaj zasebno skupino kanala"
 
-#: src/protocols/silc/chat.c:720
+#: src/protocols/silc/chat.c:721
 msgid "User Limit"
 msgstr "Meja uporabnikov"
 
-#: src/protocols/silc/chat.c:721
+#: src/protocols/silc/chat.c:722
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr "Nastavite mejo uporabnikov kanala. Izberite 0 za ponastavitev meje."
 
-#: src/protocols/silc/chat.c:863
+#: src/protocols/silc/chat.c:877
 msgid "Get Info"
 msgstr "Informacije"
 
-#: src/protocols/silc/chat.c:871
+#: src/protocols/silc/chat.c:885
 msgid "Invite List"
 msgstr "Seznam povabljenih"
 
-#: src/protocols/silc/chat.c:876
+#: src/protocols/silc/chat.c:890
 msgid "Ban List"
 msgstr "Seznam prepovedanih"
 
-#: src/protocols/silc/chat.c:884
+#: src/protocols/silc/chat.c:898
 msgid "Add Private Group"
 msgstr "Dodaj zasebno skupino"
 
-#: src/protocols/silc/chat.c:897
+#: src/protocols/silc/chat.c:911
 msgid "Reset Permanent"
 msgstr "Za�asno ponastavi"
 
-#: src/protocols/silc/chat.c:902
+#: src/protocols/silc/chat.c:916
 msgid "Set Permanent"
 msgstr "Za�asno nastavi"
 
-#: src/protocols/silc/chat.c:910
+#: src/protocols/silc/chat.c:924
 msgid "Set User Limit"
 msgstr "Nastavi mejo uporabnikov"
 
-#: src/protocols/silc/chat.c:916
+#: src/protocols/silc/chat.c:930
 msgid "Reset Topic Restriction"
 msgstr "Ponastavi omejitev teme"
 
-#: src/protocols/silc/chat.c:921
+#: src/protocols/silc/chat.c:935
 msgid "Set Topic Restriction"
 msgstr "Nastavi omejitev teme"
 
-#: src/protocols/silc/chat.c:928
+#: src/protocols/silc/chat.c:942
 msgid "Reset Private Channel"
 msgstr "Ponastavi zasebni kanal"
 
-#: src/protocols/silc/chat.c:933
+#: src/protocols/silc/chat.c:947
 msgid "Set Private Channel"
 msgstr "Nastavi zasebni kanal"
 
-#: src/protocols/silc/chat.c:940
+#: src/protocols/silc/chat.c:954
 msgid "Reset Secret Channel"
 msgstr "Ponastavi skrivni kanal"
 
-#: src/protocols/silc/chat.c:945
+#: src/protocols/silc/chat.c:959
 msgid "Set Secret Channel"
 msgstr "Nastavi skrivni kanal"
 
-#: src/protocols/silc/chat.c:1008
+#: src/protocols/silc/chat.c:1032
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "Ste ustanovitelj kanala <I>%s</I>"
 
-#: src/protocols/silc/chat.c:1012
+#: src/protocols/silc/chat.c:1036
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "Ustanovitelj kanala na <I>%s</I> je <I>%s</I>"
 
-#: src/protocols/silc/chat.c:1071
-#, c-format
-msgid ""
-"You have to join the %s channel before you are able to join the private group"
+#: src/protocols/silc/chat.c:1095
+#, c-format
+msgid "You have to join the %s channel before you are able to join the private group"
 msgstr "Preden se pridru転ite zasebni skupini, se morate pridru転iti kanalu %s"
 
-#: src/protocols/silc/chat.c:1073
+#: src/protocols/silc/chat.c:1097
 msgid "Join Private Group"
 msgstr "Pridru転i se zasebni skupini"
 
-#: src/protocols/silc/chat.c:1074
+#: src/protocols/silc/chat.c:1098
 msgid "Cannot join private group"
 msgstr "Ni se mogo�e pridru転iti zasebni skupini"
 
-#: src/protocols/silc/chat.c:1267 src/protocols/silc/silc.c:917
+#: src/protocols/silc/chat.c:1292
+#: src/protocols/silc/silc.c:1138
 msgid "Cannot call command"
 msgstr "Ni mogo�e klicati ukaza"
 
-#: src/protocols/silc/chat.c:1268 src/protocols/silc/silc.c:918
+#: src/protocols/silc/chat.c:1293
+#: src/protocols/silc/silc.c:1139
 msgid "Unknown command"
 msgstr "Neznan ukaz"
 
-#: src/protocols/silc/ft.c:89 src/protocols/silc/ft.c:92
-#: src/protocols/silc/ft.c:96 src/protocols/silc/ft.c:100
-#: src/protocols/silc/ft.c:104 src/protocols/silc/ft.c:205
-#: src/protocols/silc/ft.c:210 src/protocols/silc/ft.c:215
-#: src/protocols/silc/ft.c:221 src/protocols/silc/ft.c:340
+#: src/protocols/silc/ft.c:89
+#: src/protocols/silc/ft.c:92
+#: src/protocols/silc/ft.c:96
+#: src/protocols/silc/ft.c:100
+#: src/protocols/silc/ft.c:104
+#: src/protocols/silc/ft.c:205
+#: src/protocols/silc/ft.c:210
+#: src/protocols/silc/ft.c:215
+#: src/protocols/silc/ft.c:221
+#: src/protocols/silc/ft.c:340
 msgid "Secure File Transfer"
 msgstr "Varen prenos datotek"
 
-#: src/protocols/silc/ft.c:90 src/protocols/silc/ft.c:93
-#: src/protocols/silc/ft.c:97 src/protocols/silc/ft.c:101
+#: src/protocols/silc/ft.c:90
+#: src/protocols/silc/ft.c:93
+#: src/protocols/silc/ft.c:97
+#: src/protocols/silc/ft.c:101
 #: src/protocols/silc/ft.c:105
 msgid "Error during file transfer"
 msgstr "Napaka pri prenosu datotek"
@@ -9551,150 +10382,159 @@
 msgid "Cannot send file"
 msgstr "Ni mogo�e poslati datoteke"
 
-#: src/protocols/silc/ops.c:341 src/protocols/silc/ops.c:350
-#: src/protocols/silc/ops.c:359
+#: src/protocols/silc/ops.c:555
+#: src/protocols/silc/ops.c:564
+#: src/protocols/silc/ops.c:573
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s je spremenil temo kanala <I>%s</I> na: %s"
 
-#: src/protocols/silc/ops.c:425
+#: src/protocols/silc/ops.c:639
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> je nastavil na�ine kanala <I>%s</I> na: %s"
 
-#: src/protocols/silc/ops.c:429
+#: src/protocols/silc/ops.c:643
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> je odstranil vse na�ine kanala <I>%s</I>"
 
-#: src/protocols/silc/ops.c:462
+#: src/protocols/silc/ops.c:676
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> je nastavil na�ine uporabnika <I>%s</I> na: %s"
 
-#: src/protocols/silc/ops.c:470
+#: src/protocols/silc/ops.c:684
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> je odstranil vse na�ine uporabnika <I>%s</I>"
 
-#: src/protocols/silc/ops.c:499
+#: src/protocols/silc/ops.c:713
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Iz <I>%s</I> vas je brcnil uporabnik <I>%s</I> (%s)"
 
-#: src/protocols/silc/ops.c:529 src/protocols/silc/ops.c:534
-#: src/protocols/silc/ops.c:539
+#: src/protocols/silc/ops.c:743
+#: src/protocols/silc/ops.c:748
+#: src/protocols/silc/ops.c:753
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "Ubil vas je %s (%s)"
 
-#: src/protocols/silc/ops.c:560 src/protocols/silc/ops.c:565
-#: src/protocols/silc/ops.c:570
+#: src/protocols/silc/ops.c:774
+#: src/protocols/silc/ops.c:779
+#: src/protocols/silc/ops.c:784
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "Ubil vas je %s (%s)"
 
-#: src/protocols/silc/ops.c:616
+#: src/protocols/silc/ops.c:830
 msgid "Server signoff"
 msgstr "Odjava stre転nika"
 
-#: src/protocols/silc/ops.c:803
+#: src/protocols/silc/ops.c:1017
 msgid "Personal Information"
 msgstr "Osebni podatki"
 
-#: src/protocols/silc/ops.c:826
+#: src/protocols/silc/ops.c:1040
 msgid "Birth Day"
 msgstr "Rojstni dan"
 
-#: src/protocols/silc/ops.c:830
+#: src/protocols/silc/ops.c:1044
 msgid "Job Title"
 msgstr "Naziv slu転be"
 
-#: src/protocols/silc/ops.c:834
+#: src/protocols/silc/ops.c:1048
 msgid "Job Role"
 msgstr "Funkcija v slu転bi"
 
-#: src/protocols/silc/ops.c:838
+#: src/protocols/silc/ops.c:1052
+#: src/protocols/silc/silc.c:927
 msgid "Organization"
 msgstr "Organizacija"
 
-#: src/protocols/silc/ops.c:842
+#: src/protocols/silc/ops.c:1056
 msgid "Unit"
 msgstr "Enota"
 
-#: src/protocols/silc/ops.c:861
+#: src/protocols/silc/ops.c:1075
 msgid "EMail"
 msgstr "E-po邸ta"
 
-#: src/protocols/silc/ops.c:866
+#: src/protocols/silc/ops.c:1080
 msgid "Note"
 msgstr "Opomba"
 
-#: src/protocols/silc/ops.c:914
+#: src/protocols/silc/ops.c:1128
 msgid "Join Chat"
 msgstr "Pridru転i se klepetu"
 
-#: src/protocols/silc/ops.c:1070 src/protocols/silc/ops.c:1140
+#: src/protocols/silc/ops.c:1284
+#: src/protocols/silc/ops.c:1354
 msgid "Public Key Fingerprint"
 msgstr "Prstni odtis javnega klju�a"
 
-#: src/protocols/silc/ops.c:1071 src/protocols/silc/ops.c:1141
+#: src/protocols/silc/ops.c:1285
+#: src/protocols/silc/ops.c:1355
 msgid "Public Key Babbleprint"
 msgstr "Odtis javnega klju�a"
 
-#: src/protocols/silc/ops.c:1084
+#: src/protocols/silc/ops.c:1298
 msgid "More..."
 msgstr "Ve� ..."
 
-#: src/protocols/silc/ops.c:1155 src/protocols/silc/silc.c:805
+#: src/protocols/silc/ops.c:1369
+#: src/protocols/silc/silc.c:993
 msgid "Detach From Server"
 msgstr "Odpni se od stre転nika"
 
-#: src/protocols/silc/ops.c:1155
+#: src/protocols/silc/ops.c:1369
 msgid "Cannot detach"
 msgstr "Ni se mo� odpeti"
 
-#: src/protocols/silc/ops.c:1166
+#: src/protocols/silc/ops.c:1380
 msgid "Cannot set topic"
 msgstr "Ne da se nastaviti teme"
 
-#: src/protocols/silc/ops.c:1198
+#: src/protocols/silc/ops.c:1412
 msgid "Failed to change nickname"
 msgstr "Vzdevka ni bilo mo� spremeniti"
 
-#: src/protocols/silc/ops.c:1246
+#: src/protocols/silc/ops.c:1460
 msgid "Roomlist"
 msgstr "Seznam sob"
 
-#: src/protocols/silc/ops.c:1246
+#: src/protocols/silc/ops.c:1460
 msgid "Cannot get room list"
 msgstr "Ni mogo�e dobiti seznama sob"
 
-#: src/protocols/silc/ops.c:1291
+#: src/protocols/silc/ops.c:1505
 msgid "No public key was received"
 msgstr "Javni klju� ni bil sprejet"
 
-#: src/protocols/silc/ops.c:1304 src/protocols/silc/ops.c:1317
+#: src/protocols/silc/ops.c:1518
+#: src/protocols/silc/ops.c:1531
 msgid "Server Information"
 msgstr "Informacije o stre転niku"
 
-#: src/protocols/silc/ops.c:1305
+#: src/protocols/silc/ops.c:1519
 msgid "Cannot get server information"
 msgstr "Ni mo� dobiti informacij o stre転niku"
 
-#: src/protocols/silc/ops.c:1334 src/protocols/silc/ops.c:1343
+#: src/protocols/silc/ops.c:1548
+#: src/protocols/silc/ops.c:1557
 msgid "Server Statistics"
 msgstr "Statistika stre転nika"
 
-#: src/protocols/silc/ops.c:1335
+#: src/protocols/silc/ops.c:1549
 msgid "Cannot get server statistics"
 msgstr "Ni mo� dobiti statistike stre転nika"
 
-#: src/protocols/silc/ops.c:1344
+#: src/protocols/silc/ops.c:1558
 msgid "No server statistics available"
 msgstr "Statistika stre転nika ni na voljo."
 
-#: src/protocols/silc/ops.c:1366
+#: src/protocols/silc/ops.c:1580
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9729,110 +10569,105 @@
 "Vseh operaterjev stre転nikov: %d\n"
 "Vseh operaterjev usmerjevalnikov: %d\n"
 
-#: src/protocols/silc/ops.c:1389
+#: src/protocols/silc/ops.c:1603
 msgid "Network Statistics"
 msgstr "Statistika omre転ja"
 
-#: src/protocols/silc/ops.c:1397 src/protocols/silc/ops.c:1402
+#: src/protocols/silc/ops.c:1611
+#: src/protocols/silc/ops.c:1616
 msgid "Ping"
 msgstr "Ping"
 
-#: src/protocols/silc/ops.c:1397
+#: src/protocols/silc/ops.c:1611
 msgid "Ping failed"
 msgstr "Ping ni uspel"
 
-#: src/protocols/silc/ops.c:1402
+#: src/protocols/silc/ops.c:1616
 msgid "Ping reply received from server"
 msgstr "Odgovor ping sprejet od stre転nika"
 
-#: src/protocols/silc/ops.c:1410
+#: src/protocols/silc/ops.c:1624
 msgid "Could not kill user"
 msgstr "Ni bilo mogo�e ubiti uporabnika"
 
-#: src/protocols/silc/ops.c:1494
+#: src/protocols/silc/ops.c:1708
 msgid "Error during connecting to SILC Server"
 msgstr "Napaka pri povezovanju s stre転nikom SILC"
 
-#: src/protocols/silc/ops.c:1499
+#: src/protocols/silc/ops.c:1713
 msgid "Key Exchange failed"
 msgstr "Izmenjava klju�a ni uspela"
 
-#: src/protocols/silc/ops.c:1508
-msgid ""
-"Resuming detached session failed. Press Reconnect to create new connection."
-msgstr ""
-"Nadaljevalna odpeta seja ni uspela. Pritisnite ponovna povezava za "
-"ustvarjanje nove povezave."
-
-#: src/protocols/silc/ops.c:1543
+#: src/protocols/silc/ops.c:1722
+msgid "Resuming detached session failed. Press Reconnect to create new connection."
+msgstr "Nadaljevalna odpeta seja ni uspela. Pritisnite ponovna povezava za ustvarjanje nove povezave."
+
+#: src/protocols/silc/ops.c:1757
 msgid "Disconnected by server"
 msgstr "Stre転nik je prekinil povezavo"
 
-#: src/protocols/silc/ops.c:1605 src/protocols/silc/ops.c:1652
-#: src/protocols/silc/silc.c:194
+#: src/protocols/silc/ops.c:1819
+#: src/protocols/silc/ops.c:1866
+#: src/protocols/silc/silc.c:195
 msgid "Resuming session"
 msgstr "Nadaljevalna seja"
 
-#: src/protocols/silc/ops.c:1607
+#: src/protocols/silc/ops.c:1821
 msgid "Authenticating connection"
 msgstr "Overovljanje povezave"
 
-#: src/protocols/silc/ops.c:1654
+#: src/protocols/silc/ops.c:1868
 msgid "Verifying server public key"
 msgstr "Preverjanje javnega klju�a stre転nika"
 
-#: src/protocols/silc/ops.c:1695
+#: src/protocols/silc/ops.c:1909
 msgid "Passphrase required"
 msgstr "Zahtevano geslo"
 
-#: src/protocols/silc/ops.c:1724
+#: src/protocols/silc/ops.c:1938
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Napaka: Neustrezna razli�ica, nadgradite svojega odjemalca"
 
-#: src/protocols/silc/ops.c:1727
+#: src/protocols/silc/ops.c:1941
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "Napaka: Oddaljeni ne podpira va邸ega klju�a ali mu ne zaupa"
 
-#: src/protocols/silc/ops.c:1730
+#: src/protocols/silc/ops.c:1944
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Napaka: Oddaljeni ne podpira predlagane skupine KE"
 
-#: src/protocols/silc/ops.c:1733
+#: src/protocols/silc/ops.c:1947
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Napaka: Oddaljeni ne podpira predlagane cifre"
 
-#: src/protocols/silc/ops.c:1736
+#: src/protocols/silc/ops.c:1950
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Napaka: Oddaljeni ne podpira predlaganega PKCS"
 
-#: src/protocols/silc/ops.c:1739
+#: src/protocols/silc/ops.c:1953
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Napaka: Oddaljeni ne podpira predlagane razpr邸ene mo転nosti"
 
-#: src/protocols/silc/ops.c:1742
+#: src/protocols/silc/ops.c:1956
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Napaka: Oddaljeni ne podpira predlaganega HMAC"
 
-#: src/protocols/silc/ops.c:1744
+#: src/protocols/silc/ops.c:1958
 msgid "Failure: Incorrect signature"
 msgstr "Napaka: Napa�en podpis"
 
-#: src/protocols/silc/ops.c:1746
+#: src/protocols/silc/ops.c:1960
 msgid "Failure: Invalid cookie"
 msgstr "Napaka: Napa�en pi邸kot"
 
-#: src/protocols/silc/ops.c:1757
+#: src/protocols/silc/ops.c:1971
 msgid "Failure: Authentication failed"
 msgstr "Napaka: Overovitev ni uspela"
 
 #: src/protocols/silc/pk.c:103
 #, c-format
-msgid ""
-"Received %s's public key. Your local copy does not match this key. Would you "
-"still like to accept this public key?"
-msgstr ""
-"Sprejet javni klju� uporabnika %s. Va邸a lokalna kopija ne ustreza temu "
-"klju�u. 貼elite kljub temu sprejeti ta javni klju�?"
+msgid "Received %s's public key. Your local copy does not match this key. Would you still like to accept this public key?"
+msgstr "Sprejet javni klju� uporabnika %s. Va邸a lokalna kopija ne ustreza temu klju�u. 貼elite kljub temu sprejeti ta javni klju�?"
 
 #: src/protocols/silc/pk.c:108
 #, c-format
@@ -9852,7 +10687,8 @@
 "%s\n"
 "%s\n"
 
-#: src/protocols/silc/pk.c:115 src/protocols/silc/pk.c:140
+#: src/protocols/silc/pk.c:115
+#: src/protocols/silc/pk.c:140
 msgid "Verify Public Key"
 msgstr "Preveri javni klju�"
 
@@ -9864,36 +10700,36 @@
 msgid "Unsupported public key type"
 msgstr "Nepodprt tip javnega klju�a"
 
-#: src/protocols/silc/silc.c:154
+#: src/protocols/silc/silc.c:155
 msgid "Connection failed"
 msgstr "Povezava ni uspela"
 
-#: src/protocols/silc/silc.c:186
+#: src/protocols/silc/silc.c:187
 msgid "Cannot initialize SILC Client connection"
 msgstr "Ni mo� za�eti povezave odjemalca SILC"
 
-#: src/protocols/silc/silc.c:197
+#: src/protocols/silc/silc.c:198
 msgid "Performing key exchange"
 msgstr "Izvajanje izmenjave klju�ev"
 
-#: src/protocols/silc/silc.c:270
+#: src/protocols/silc/silc.c:273
 msgid "Out of memory"
 msgstr "Zmanjkalo je pomnilnika"
 
 #. Progress
-#: src/protocols/silc/silc.c:309
+#: src/protocols/silc/silc.c:326
 msgid "Connecting to SILC Server"
 msgstr "Povezovanjes stre転nikom SILC"
 
-#: src/protocols/silc/silc.c:630
+#: src/protocols/silc/silc.c:654
 msgid "Your Current Mood"
 msgstr "Va邸e trenutno razpolo転enje"
 
-#: src/protocols/silc/silc.c:632
+#: src/protocols/silc/silc.c:656
 msgid "Normal"
 msgstr "Navadno"
 
-#: src/protocols/silc/silc.c:657
+#: src/protocols/silc/silc.c:681
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9901,269 +10737,270 @@
 "\n"
 "Va邸a priljubljena metoda stikov"
 
-#: src/protocols/silc/silc.c:665 src/protocols/silc/util.c:517
+#: src/protocols/silc/silc.c:689
+#: src/protocols/silc/util.c:518
 msgid "SMS"
 msgstr "SMS"
 
-#: src/protocols/silc/silc.c:667 src/protocols/silc/util.c:519
+#: src/protocols/silc/silc.c:691
+#: src/protocols/silc/util.c:520
 msgid "MMS"
 msgstr "MMS"
 
-#: src/protocols/silc/silc.c:669 src/protocols/silc/util.c:521
+#: src/protocols/silc/silc.c:693
+#: src/protocols/silc/util.c:522
 msgid "Video Conferencing"
 msgstr "Video-konferenca"
 
-#: src/protocols/silc/silc.c:674
+#: src/protocols/silc/silc.c:698
 msgid "Your Current Status"
 msgstr "Va邸e trenutno stanje"
 
-#: src/protocols/silc/silc.c:681
+#: src/protocols/silc/silc.c:705
 msgid "Online Services"
 msgstr "Storitve na zvezi"
 
-#: src/protocols/silc/silc.c:684
+#: src/protocols/silc/silc.c:708
 msgid "Let others see what services you are using"
 msgstr "Naj ostali vidijo, katere storitve uporabljate"
 
-#: src/protocols/silc/silc.c:690
+#: src/protocols/silc/silc.c:714
 msgid "Let others see what computer you are using"
 msgstr "Naj ostali vidijo, kak邸en ra�unalnik uporabljate"
 
-#: src/protocols/silc/silc.c:697
+#: src/protocols/silc/silc.c:721
 msgid "Your VCard File"
 msgstr "Va邸a datoteka VCard"
 
-#: src/protocols/silc/silc.c:710 src/protocols/silc/silc.c:711
+#: src/protocols/silc/silc.c:733
+#: src/protocols/silc/silc.c:734
 msgid "User Online Status Attributes"
 msgstr "Atributi stanja uporabnika na zvezi"
 
-#: src/protocols/silc/silc.c:712
-msgid ""
-"You can let other users see your online status information and your personal "
-"information. Please fill the information you would like other users to see "
-"about yourself."
-msgstr ""
-"Ostalim uporabnikom lahko dovolite ogled informacij o va邸em stanju na zvezi "
-"in osebnih informacij. Izpolnite informacije, ki jih 転elite pokazati ostalim "
-"uporabnikom."
-
-#: src/protocols/silc/silc.c:752 src/protocols/silc/silc.c:758
-#: src/protocols/silc/silc.c:1162
+#: src/protocols/silc/silc.c:735
+msgid "You can let other users see your online status information and your personal information. Please fill the information you would like other users to see about yourself."
+msgstr "Ostalim uporabnikom lahko dovolite ogled informacij o va邸em stanju na zvezi in osebnih informacij. Izpolnite informacije, ki jih 転elite pokazati ostalim uporabnikom."
+
+#: src/protocols/silc/silc.c:775
+#: src/protocols/silc/silc.c:781
+#: src/protocols/silc/silc.c:1411
 msgid "Message of the Day"
 msgstr "Sporo�ilo dneva"
 
-#: src/protocols/silc/silc.c:752
+#: src/protocols/silc/silc.c:775
 msgid "No Message of the Day available"
 msgstr "Sporo�ilo dneva ni na voljo"
 
-#: src/protocols/silc/silc.c:753 src/protocols/silc/silc.c:1157
+#: src/protocols/silc/silc.c:776
+#: src/protocols/silc/silc.c:1406
 msgid "There is no Message of the Day associated with this connection"
 msgstr "S to povezavo ni povezano nobeno sporo�ilo dneva"
 
-#: src/protocols/silc/silc.c:800
+#: src/protocols/silc/silc.c:827
+#: src/protocols/silc/silc.c:871
+#: src/protocols/silc/silc.c:942
+#: src/protocols/silc/silc.c:943
+msgid "Create New SILC Key Pair"
+msgstr "Ustvari nov par klju�ev SILC"
+
+#: src/protocols/silc/silc.c:827
+msgid "Passphrases do not match"
+msgstr "Gesli se ne ujemata"
+
+#: src/protocols/silc/silc.c:871
+msgid "Key Pair Generation failed"
+msgstr "Ustvarjanje para klju�ev ni uspelo"
+
+#: src/protocols/silc/silc.c:910
+msgid "Key Length"
+msgstr "Dol転ina klju�a"
+
+#: src/protocols/silc/silc.c:912
+msgid "Public Key File"
+msgstr "Datoteka z javnim klju�em"
+
+#: src/protocols/silc/silc.c:914
+msgid "Private Key File"
+msgstr "Datoteka z zasebnim klju�em"
+
+#: src/protocols/silc/silc.c:921
+msgid "Hostname"
+msgstr "Ime gostitelja"
+
+#: src/protocols/silc/silc.c:923
+msgid "Real Name"
+msgstr "Resni�no ime"
+
+#: src/protocols/silc/silc.c:937
+msgid "Re-type Passphrase"
+msgstr "Ponovno vnesite geslo"
+
+#: src/protocols/silc/silc.c:944
+msgid "Generate Key Pair"
+msgstr "Ustvari par klju�ev"
+
+#: src/protocols/silc/silc.c:988
 msgid "Online Status"
 msgstr "Stanje na zvezi"
 
-#: src/protocols/silc/silc.c:809
+#: src/protocols/silc/silc.c:997
 msgid "View Message of the Day"
 msgstr "Ogled sporo�ila dneva"
 
-#: src/protocols/silc/silc.c:882
+#: src/protocols/silc/silc.c:1001
+msgid "Create SILC Key Pair..."
+msgstr "Ustvari par klju�ev SILC ..."
+
+#: src/protocols/silc/silc.c:1096
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "Uporabnik <I>%s</I> ni prisoten v omre転ju"
 
-#: src/protocols/silc/silc.c:1033
+#: src/protocols/silc/silc.c:1282
 msgid "Topic too long"
 msgstr "Temal je predolga."
 
-#: src/protocols/silc/silc.c:1114
+#: src/protocols/silc/silc.c:1363
 msgid "You must specify a nick"
 msgstr "Dolo�iti morate vzdevek"
 
-#: src/protocols/silc/silc.c:1216
+#: src/protocols/silc/silc.c:1465
 #, c-format
 msgid "channel %s not found"
 msgstr "kanala %s ni mogo�e najti"
 
-#: src/protocols/silc/silc.c:1221
+#: src/protocols/silc/silc.c:1470
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "na�ini kanala za %s: %s"
 
-#: src/protocols/silc/silc.c:1223
+#: src/protocols/silc/silc.c:1472
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "na�ini kanala za %s niso nastavljeni"
 
-#: src/protocols/silc/silc.c:1236
+#: src/protocols/silc/silc.c:1485
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Ni mogo�e nastaviti na�inov za %s"
 
-#: src/protocols/silc/silc.c:1266
+#: src/protocols/silc/silc.c:1515
 #, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
 msgstr "Neznan ukaz: %s, (morda hro邸� v Gaimu)"
 
-#: src/protocols/silc/silc.c:1329
+#: src/protocols/silc/silc.c:1578
 msgid "part [channel]:  Leave the chat"
 msgstr "part [kanal]:  Zapusti klepet"
 
-#: src/protocols/silc/silc.c:1333
+#: src/protocols/silc/silc.c:1582
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [kanal]:  Zapusti klepet"
 
-#: src/protocols/silc/silc.c:1337
+#: src/protocols/silc/silc.c:1586
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;nova tema&gt;]:  Ogled ali sprememba teme"
 
-#: src/protocols/silc/silc.c:1342
+#: src/protocols/silc/silc.c:1591
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
-msgstr ""
-"join &lt;kanal&gt; [&lt;geslo&gt;]:  Pridru転i se klepetu na tem omre転ju"
-
-#: src/protocols/silc/silc.c:1346
+msgstr "join &lt;kanal&gt; [&lt;geslo&gt;]:  Pridru転i se klepetu na tem omre転ju"
+
+#: src/protocols/silc/silc.c:1595
 msgid "list:  List channels on this network"
 msgstr "list:  Seznam kanalov na tem omre転ju"
 
-#: src/protocols/silc/silc.c:1350
+#: src/protocols/silc/silc.c:1599
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;vzdevek&gt;:  Oglej si informacije vzdevka"
 
-#: src/protocols/silc/silc.c:1354 src/protocols/zephyr/zephyr.c:2597
+#: src/protocols/silc/silc.c:1603
+#: src/protocols/zephyr/zephyr.c:2597
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
-msgstr ""
-"msg &lt;vzdevek&gt; &lt;sporo�ilo&gt;:  Po邸lji zasebno sporo�ilo uporabniku"
-
-#: src/protocols/silc/silc.c:1358
+msgstr "msg &lt;vzdevek&gt; &lt;sporo�ilo&gt;:  Po邸lji zasebno sporo�ilo uporabniku"
+
+#: src/protocols/silc/silc.c:1607
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
-msgstr ""
-"query &lt;vzdevek&gt; [&lt;sporo�ilo&gt;]:  Po邸lji zasebno sporo�ilo "
-"uporabniku"
-
-#: src/protocols/silc/silc.c:1362
+msgstr "query &lt;vzdevek&gt; [&lt;sporo�ilo&gt;]:  Po邸lji zasebno sporo�ilo uporabniku"
+
+#: src/protocols/silc/silc.c:1611
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  Ogled sporo�ila dneva na stre転niku"
 
-#: src/protocols/silc/silc.c:1366
+#: src/protocols/silc/silc.c:1615
 msgid "detach:  Detach this session"
 msgstr "odpni:  Odpni to sejo"
 
-#: src/protocols/silc/silc.c:1370
+#: src/protocols/silc/silc.c:1619
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [sporo�ilo]:  Prekini povezavo s stre転nikom z mo転nostjo sporo�ila"
 
-#: src/protocols/silc/silc.c:1374
+#: src/protocols/silc/silc.c:1623
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "pomo� &lt;ukaz&gt;:  Pomo� o dolo�enem ukazu"
 
-#: src/protocols/silc/silc.c:1380
+#: src/protocols/silc/silc.c:1629
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;vzdevek&gt; [-javniklju�|&lt;razlog&gt;]:  Ubij vzdevek"
 
-#: src/protocols/silc/silc.c:1384
+#: src/protocols/silc/silc.c:1633
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;novvzdevek&gt;:  Spremenite va邸 vzdevek"
 
-#: src/protocols/silc/silc.c:1388
+#: src/protocols/silc/silc.c:1637
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;vzdevek&gt;:  Ogled informacij o vzdevku"
 
-#: src/protocols/silc/silc.c:1392
-msgid ""
-"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
-"channel modes"
-msgstr ""
-"cmode &lt;kanall&gt; [+|-&lt;na�ini&gt;] [argumenti]:  Spremeni ali prika転i "
-"na�ine kanala"
-
-#: src/protocols/silc/silc.c:1396
-msgid ""
-"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
-"on channel"
-msgstr ""
-"cumode &lt;kanal&gt; +|-&lt;na�ini&gt; &lt;vzdevek&gt;:  Spremeni na�ine "
-"vzdevka na kanalu"
-
-#: src/protocols/silc/silc.c:1400
+#: src/protocols/silc/silc.c:1641
+msgid "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display channel modes"
+msgstr "cmode &lt;kanall&gt; [+|-&lt;na�ini&gt;] [argumenti]:  Spremeni ali prika転i na�ine kanala"
+
+#: src/protocols/silc/silc.c:1645
+msgid "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes on channel"
+msgstr "cumode &lt;kanal&gt; +|-&lt;na�ini&gt; &lt;vzdevek&gt;:  Spremeni na�ine vzdevka na kanalu"
+
+#: src/protocols/silc/silc.c:1649
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;na�iniuporabnika&gt;:  Nastavite va邸e na�ine v omre転ju"
 
-#: src/protocols/silc/silc.c:1404
+#: src/protocols/silc/silc.c:1653
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
-msgstr ""
-"oper &lt;vzdevek&gt; [-javniklju�]:  Dodeli pravice operaterju stre転nika"
-
-#: src/protocols/silc/silc.c:1408
-msgid ""
-"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
-"channel invite list"
-msgstr ""
-"invite &lt;kanal&gt; [-|+]&lt;vzdevek&gt;:  povabi vzdevek ali dodaj/"
-"odstrani iz seznama povabljenih na kanal"
-
-#: src/protocols/silc/silc.c:1412
+msgstr "oper &lt;vzdevek&gt; [-javniklju�]:  Dodeli pravice operaterju stre転nika"
+
+#: src/protocols/silc/silc.c:1657
+msgid "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from channel invite list"
+msgstr "invite &lt;kanal&gt; [-|+]&lt;vzdevek&gt;:  povabi vzdevek ali dodaj/odstrani iz seznama povabljenih na kanal"
+
+#: src/protocols/silc/silc.c:1661
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
-msgstr ""
-"kick &lt;kanal&gt; &lt;vzdevek&gt; [komentar]:  Brcni odjemalca s kanala"
-
-#: src/protocols/silc/silc.c:1416
+msgstr "kick &lt;kanal&gt; &lt;vzdevek&gt; [komentar]:  Brcni odjemalca s kanala"
+
+#: src/protocols/silc/silc.c:1665
 msgid "info [server]:  View server administrative details"
-msgstr "info [stre転nik]:  Ogled nadzorni邸kih podrobnosti stre転nika"
-
-#: src/protocols/silc/silc.c:1420
+msgstr "info [stre転nik]:  Ogled skrbni邸kih podrobnosti stre転nika"
+
+#: src/protocols/silc/silc.c:1669
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;kanal&gt; +|-&lt;vzdevek&gt;]:  Prepovaj odjemalca na kanalu"
 
-#: src/protocols/silc/silc.c:1424
+#: src/protocols/silc/silc.c:1673
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
-msgstr ""
-"getkey &lt;vzdevek|stre転nik&gt;:  Pridobi javni klju� odjemalca ali stre転nika"
-
-#: src/protocols/silc/silc.c:1428
+msgstr "getkey &lt;vzdevek|stre転nik&gt;:  Pridobi javni klju� odjemalca ali stre転nika"
+
+#: src/protocols/silc/silc.c:1677
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Ogled statistike omre転ja in stre転nika"
 
-#: src/protocols/silc/silc.c:1432
+#: src/protocols/silc/silc.c:1681
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Po邸lji PING povezanemu stre転niku"
 
-#: src/protocols/silc/silc.c:1437
+#: src/protocols/silc/silc.c:1686
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;kanal&gt;:  Navedi uporabnike v kanalu"
 
-#: src/protocols/silc/silc.c:1441
-msgid ""
-"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
-"specific users in channel(s)"
-msgstr ""
-"names [-邸t|-op|-polop|-glas|-navadni] &lt;kanal(i)&gt;:  Seznam dolo�enih "
-"uporabnikov na kanalu(ih)"
-
-#: src/protocols/silc/silc.c:1453
-msgid "Instant Messages"
-msgstr "Neposredna sporo�ila"
-
-#: src/protocols/silc/silc.c:1458
-msgid "Digitally sign all IM messages"
-msgstr "Digitalno podpi邸i vsa vsa neposredna sporo�ila"
-
-#: src/protocols/silc/silc.c:1463
-msgid "Verify all IM message signatures"
-msgstr "Preveri podpise vseh neposrednih sporo�il"
-
-#: src/protocols/silc/silc.c:1466
-msgid "Channel Messages"
-msgstr "Sporo�ila kanala"
-
-#: src/protocols/silc/silc.c:1471
-msgid "Digitally sign all channel messages"
-msgstr "Digitalno podpi邸i vsa sporo�ila kanala"
-
-#: src/protocols/silc/silc.c:1476
-msgid "Verify all channel message signatures"
-msgstr "Preveri podpise vseh sporo�il kanala"
+#: src/protocols/silc/silc.c:1690
+msgid "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List specific users in channel(s)"
+msgstr "names [-邸t|-op|-polop|-glas|-navadni] &lt;kanal(i)&gt;:  Seznam dolo�enih uporabnikov na kanalu(ih)"
 
 #. *< type
 #. *< ui_requirement
@@ -10174,91 +11011,112 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1564
+#: src/protocols/silc/silc.c:1790
 msgid "SILC Protocol Plugin"
 msgstr "Vstavek za protokol SILC"
 
 #. *  description
-#: src/protocols/silc/silc.c:1566
+#: src/protocols/silc/silc.c:1792
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Protokol SILC (Varen internetni konferen�ni sistem v 転ivo)"
 
-#: src/protocols/silc/silc.c:1600
+#: src/protocols/silc/silc.c:1829
 msgid "Public Key file"
 msgstr "Datoteka z javnim klju�em"
 
-#: src/protocols/silc/silc.c:1604
+#: src/protocols/silc/silc.c:1833
 msgid "Private Key file"
 msgstr "Datoteka z zasebnim klju�em"
 
-#: src/protocols/silc/silc.c:1607
+#: src/protocols/silc/silc.c:1843
+msgid "Cipher"
+msgstr "Cipher"
+
+#: src/protocols/silc/silc.c:1853
+msgid "HMAC"
+msgstr "HMAC"
+
+#: src/protocols/silc/silc.c:1856
 msgid "Public key authentication"
 msgstr "Overovitev javnega klju�a"
 
-#: src/protocols/silc/silc.c:1611
+#: src/protocols/silc/silc.c:1859
 msgid "Reject watching by other users"
 msgstr "Zavrni ogledovanje drugih uporabnikov"
 
-#: src/protocols/silc/silc.c:1614
+#: src/protocols/silc/silc.c:1862
 msgid "Block invites"
 msgstr "Zavrni povabljene"
 
-#: src/protocols/silc/silc.c:1617
+#: src/protocols/silc/silc.c:1865
 msgid "Block IMs without Key Exchange"
 msgstr "Zavrni neposredno sporo�anje brez izmenjave klju�ev"
 
-#: src/protocols/silc/silc.c:1620
+#: src/protocols/silc/silc.c:1868
 msgid "Reject online status attribute requests"
 msgstr "Zavrni zahtevke atributov stanja uporabnikov na zvezi"
 
-#: src/protocols/silc/util.c:205 src/protocols/silc/util.c:230
+#: src/protocols/silc/silc.c:1871
+msgid "Block messages to whiteboard"
+msgstr "Blokiraj sporo�ila na tablo"
+
+#: src/protocols/silc/silc.c:1874
+msgid "Automatically open whiteboard"
+msgstr "Samodejno odpri tablo"
+
+#: src/protocols/silc/silc.c:1877
+msgid "Digitally sign and verify all messages"
+msgstr "Digitalno podpi邸i in preveri vsa sporo�ila"
+
+#: src/protocols/silc/util.c:206
+#: src/protocols/silc/util.c:231
 msgid "Creating SILC key pair..."
 msgstr "Ustvarjanje para klju�ev SILC ..."
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: src/protocols/silc/util.c:313
+#: src/protocols/silc/util.c:314
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Pravo ime: \t%s\n"
 
-#: src/protocols/silc/util.c:315
+#: src/protocols/silc/util.c:316
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Uporabni邸ko ime: \t%s\n"
 
-#: src/protocols/silc/util.c:317
+#: src/protocols/silc/util.c:318
 #, c-format
 msgid "EMail: \t\t%s\n"
 msgstr "E-po邸ta: \t\t%s\n"
 
-#: src/protocols/silc/util.c:319
+#: src/protocols/silc/util.c:320
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Ime gostitelja: \t%s\n"
 
-#: src/protocols/silc/util.c:321
+#: src/protocols/silc/util.c:322
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Organizacija: \t%s\n"
 
-#: src/protocols/silc/util.c:323
+#: src/protocols/silc/util.c:324
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "Dr転ava: \t%s\n"
 
-#: src/protocols/silc/util.c:324
+#: src/protocols/silc/util.c:325
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algoritem: \t%s\n"
 
-#: src/protocols/silc/util.c:325
+#: src/protocols/silc/util.c:326
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Dol転ina klju�a: \t%d bitov\n"
 
-#: src/protocols/silc/util.c:327
+#: src/protocols/silc/util.c:328
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -10269,7 +11127,7 @@
 "%s\n"
 "\n"
 
-#: src/protocols/silc/util.c:328
+#: src/protocols/silc/util.c:329
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -10278,26 +11136,92 @@
 "Odtis javnega klju�a:\n"
 "%s"
 
-#: src/protocols/silc/util.c:332 src/protocols/silc/util.c:333
+#: src/protocols/silc/util.c:333
+#: src/protocols/silc/util.c:334
 msgid "Public Key Information"
 msgstr "Informacije o javnem klju�u"
 
-#: src/protocols/silc/util.c:515
+#: src/protocols/silc/util.c:516
 msgid "Paging"
 msgstr "Ostranjevanje"
 
-#: src/protocols/silc/util.c:539
+#: src/protocols/silc/util.c:540
 msgid "Computer"
 msgstr "Ra�unalnik"
 
-#: src/protocols/silc/util.c:543
+#: src/protocols/silc/util.c:544
 msgid "PDA"
 msgstr "PDA"
 
-#: src/protocols/silc/util.c:545
+#: src/protocols/silc/util.c:546
 msgid "Terminal"
 msgstr "Terminal"
 
+#: src/protocols/silc/wb.c:284
+#, c-format
+msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
+msgstr "%s je poslal sporo�ilo na tablo. 貼elite odpreti tablo?"
+
+#: src/protocols/silc/wb.c:288
+#, c-format
+msgid "%s sent message to whiteboard on %s channel. Would you like to open the whiteboard?"
+msgstr "%s je poslal sporo�ilo na tablo v kanalu %s. 貼elite odpreti tablo?"
+
+#: src/protocols/silc/wb.c:302
+msgid "Whiteboard"
+msgstr "Tabla"
+
+#: src/protocols/simple/simple.c:202
+#, c-format
+msgid "Could not add the buddy %s because every simple user has to start with 'sip:'."
+msgstr "Prijatelja %s ni mogo�e dodati, kajti vsak enostaven uporabnik mora imeti na za�etku imena 'sip:'."
+
+#: src/protocols/simple/simple.c:1218
+msgid "Could not create listen socket"
+msgstr "Vti�nika ni bilo mogo�e ustvariti"
+
+#: src/protocols/simple/simple.c:1272
+msgid "SIP usernames may not contain whitespaces or @ symbols"
+msgstr "Uporabni邸ka imena SIP ne smejo vsebovati presledka ali simbola @"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: src/protocols/simple/simple.c:1418
+msgid "SIP/SIMPLE Protocol Plugin"
+msgstr "Vstavek za protokol SIP/SIMPLE"
+
+#. *  summary
+#: src/protocols/simple/simple.c:1419
+msgid "The SIP/SIMPLE Protocol Plugin"
+msgstr "Vstavek za protokol SIP/SIMPLE"
+
+#. *  description
+#: src/protocols/simple/simple.c:1420
+msgid "Thomas Butter <butter@uni-mannheim.de>"
+msgstr "Thomas Butter <butter@uni-mannheim.de>"
+
+#: src/protocols/simple/simple.c:1441
+msgid "Publish Status (note: everyone may watch you)"
+msgstr "Stanje objave (opomba: vsakdo vas lahko opazuje)"
+
+#: src/protocols/simple/simple.c:1444
+msgid "Use UDP"
+msgstr "Uporabi UDP"
+
+#: src/protocols/simple/simple.c:1446
+msgid "Use Proxy"
+msgstr "Uporabi proxy"
+
+#: src/protocols/simple/simple.c:1448
+msgid "Proxy"
+msgstr "Proxy"
+
 #: src/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
@@ -10340,8 +11264,7 @@
 
 #: src/protocols/toc/toc.c:497
 msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr ""
-"Sporo�ilo je bilo izpu邸�eno, ker presegate omejitev hitrosti stre転nika."
+msgstr "Sporo�ilo je bilo izpu邸�eno, ker presegate omejitev hitrosti stre転nika."
 
 #: src/protocols/toc/toc.c:500
 #, c-format
@@ -10413,12 +11336,8 @@
 msgstr "Va邸a raven opozoril je trenutno previsoka, da bi se lahko prijavili."
 
 #: src/protocols/toc/toc.c:552
-msgid ""
-"You have been connecting and disconnecting too frequently.  Wait ten minutes "
-"and try again.  If you continue to try, you will need to wait even longer."
-msgstr ""
-"Prijavljali in odjavljali ste se prepogosto.  Po�akajte deset minut in "
-"poskusite ponovno.  �e tega ne boste upo邸tevali, bo trajalo 邸e dlje."
+msgid "You have been connecting and disconnecting too frequently.  Wait ten minutes and try again.  If you continue to try, you will need to wait even longer."
+msgstr "Prijavljali in odjavljali ste se prepogosto.  Po�akajte deset minut in poskusite ponovno.  �e tega ne boste upo邸tevali, bo trajalo 邸e dlje."
 
 #: src/protocols/toc/toc.c:554
 #, c-format
@@ -10455,14 +11374,8 @@
 msgstr "TOC je poslal ukaz PAUSE."
 
 #: src/protocols/toc/toc.c:994
-msgid ""
-"When this happens, TOC ignores any messages sent to it, and may kick you off "
-"if you send a message. Gaim will prevent anything from going through. This "
-"is only temporary, please be patient."
-msgstr ""
-"Ko se to pripeti, TOC prezre vsa poslana sporo�ila in vas lahko celo brcne s "
-"kanala �e po邸ljete sporo�ilo. Gaim bo poskrbel, da se to ne zgodi. Stanje je "
-"le za�asno, prosim potrpite."
+msgid "When this happens, TOC ignores any messages sent to it, and may kick you off if you send a message. Gaim will prevent anything from going through. This is only temporary, please be patient."
+msgstr "Ko se to pripeti, TOC prezre vsa poslana sporo�ila in vas lahko celo brcne s kanala �e po邸ljete sporo�ilo. Gaim bo poskrbel, da se to ne zgodi. Stanje je le za�asno, prosim potrpite."
 
 #: src/protocols/toc/toc.c:1549
 msgid "Get Dir Info"
@@ -10479,11 +11392,12 @@
 
 #: src/protocols/toc/toc.c:1847
 msgid "File transfer failed; other side probably canceled."
-msgstr ""
-"Prenos datoteke ni bil uspe邸en; verjetno je prijatelj preklical prenos."
-
-#: src/protocols/toc/toc.c:1892 src/protocols/toc/toc.c:1932
-#: src/protocols/toc/toc.c:2056 src/protocols/toc/toc.c:2144
+msgstr "Prenos datoteke ni bil uspe邸en; verjetno je prijatelj preklical prenos."
+
+#: src/protocols/toc/toc.c:1892
+#: src/protocols/toc/toc.c:1932
+#: src/protocols/toc/toc.c:2056
+#: src/protocols/toc/toc.c:2144
 msgid "Could not connect for transfer."
 msgstr "Ni se bilo mogo�e povezati za prenos."
 
@@ -10519,27 +11433,29 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2316 src/protocols/toc/toc.c:2318
+#: src/protocols/toc/toc.c:2317
+#: src/protocols/toc/toc.c:2319
 msgid "TOC Protocol Plugin"
 msgstr "Dodatek za protokol TOC"
 
-#: src/protocols/toc/toc.c:2337
+#: src/protocols/toc/toc.c:2338
 msgid "TOC host"
 msgstr "TOC gostitelj"
 
-#: src/protocols/toc/toc.c:2341
+#: src/protocols/toc/toc.c:2342
 msgid "TOC port"
 msgstr "TOC vrata"
 
-#: src/protocols/yahoo/yahoo.c:706
+#: src/protocols/yahoo/yahoo.c:713
 msgid "Your Yahoo! message did not get sent."
 msgstr "Va邸e sporo�ilo za Yahoo! ni bilo poslano."
 
-#: src/protocols/yahoo/yahoo.c:752 src/protocols/yahoo/yahoo.c:3499
+#: src/protocols/yahoo/yahoo.c:759
+#: src/protocols/yahoo/yahoo.c:3482
 msgid "Buzz!!"
 msgstr "Brrr!!"
 
-#: src/protocols/yahoo/yahoo.c:797
+#: src/protocols/yahoo/yahoo.c:804
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Sistemsko sporo�ilo Yahoo! za %s:"
@@ -10547,201 +11463,186 @@
 #. TODO: this is almost exactly the same as what MSN does,
 #. * this should probably be moved to the core.
 #.
-#: src/protocols/yahoo/yahoo.c:887
+#: src/protocols/yahoo/yahoo.c:894
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list%s%s."
 msgstr "Uporabnik %s 転eli dodati %s na svoj seznam prijateljev%s%s."
 
-#: src/protocols/yahoo/yahoo.c:893
+#: src/protocols/yahoo/yahoo.c:900
 msgid "Message (optional) :"
 msgstr "Sporo�ilo (dodatno):"
 
-#: src/protocols/yahoo/yahoo.c:935
+#: src/protocols/yahoo/yahoo.c:942
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr ""
-"%s je (転e prej) zavrnil va邸o zahtevo, da ga smete dodati na svoj seznam."
-
-#: src/protocols/yahoo/yahoo.c:938
-#, c-format
-msgid ""
-"%s has (retroactively) denied your request to add them to your list for the "
-"following reason: %s."
-msgstr ""
-"%s je (転e prej) zavrnil va邸o zahtevo, da bi ga dodali na svoj seznam "
-"prijateljev zaradi naslednjega razloga: %s."
-
-#: src/protocols/yahoo/yahoo.c:941
+msgstr "%s je (転e prej) zavrnil va邸o zahtevo, da ga smete dodati na svoj seznam."
+
+#: src/protocols/yahoo/yahoo.c:945
+#, c-format
+msgid "%s has (retroactively) denied your request to add them to your list for the following reason: %s."
+msgstr "%s je (転e prej) zavrnil va邸o zahtevo, da bi ga dodali na svoj seznam prijateljev zaradi naslednjega razloga: %s."
+
+#: src/protocols/yahoo/yahoo.c:948
 msgid "Add buddy rejected"
 msgstr "Dodajanje prijatelja zavrnjeno"
 
-#: src/protocols/yahoo/yahoo.c:1684
-#, c-format
-msgid ""
-"The Yahoo server has requested the use of an unrecognized authentication "
-"method.  This version of Gaim will likely not be able to successfully sign "
-"on to Yahoo.  Check %s for updates."
-msgstr ""
-"Stre転nik Yahoo je zahteval uporabo neprepoznane metode overovitve. Ta "
-"razli�ica Gaima se verjetno ne bo uspe邸no prijavila na Yahoo. Preverite %s "
-"za posodobitve."
-
-#: src/protocols/yahoo/yahoo.c:1687
+#: src/protocols/yahoo/yahoo.c:1691
+#, c-format
+msgid "The Yahoo server has requested the use of an unrecognized authentication method.  This version of Gaim will likely not be able to successfully sign on to Yahoo.  Check %s for updates."
+msgstr "Stre転nik Yahoo je zahteval uporabo neprepoznane metode overovitve. Ta razli�ica Gaima se verjetno ne bo uspe邸no prijavila na Yahoo. Preverite %s za posodobitve."
+
+#: src/protocols/yahoo/yahoo.c:1694
 msgid "Failed Yahoo! Authentication"
 msgstr "Napaka pri overovitvi Yahoo!"
 
-#: src/protocols/yahoo/yahoo.c:1760
-#, c-format
-msgid ""
-"You have tried to ignore %s, but the user is on your buddy list.  Clicking "
-"\"Yes\" will remove and ignore the buddy."
-msgstr ""
-"Poskusili ste prezreti uporabnika %s, ki je na va邸em seznamu prijateljev. �e "
-"kliknete \"Da\" boste odstranili prijatelja in ga prezrli."
-
-#: src/protocols/yahoo/yahoo.c:1763
+#: src/protocols/yahoo/yahoo.c:1767
+#, c-format
+msgid "You have tried to ignore %s, but the user is on your buddy list.  Clicking \"Yes\" will remove and ignore the buddy."
+msgstr "Poskusili ste prezreti uporabnika %s, ki je na va邸em seznamu prijateljev. �e kliknete \"Da\" boste odstranili prijatelja in ga prezrli."
+
+#: src/protocols/yahoo/yahoo.c:1770
 msgid "Ignore buddy?"
 msgstr "Prezrem prijatelja?"
 
-#: src/protocols/yahoo/yahoo.c:1797
+#: src/protocols/yahoo/yahoo.c:1804
 msgid "Invalid username."
 msgstr "Neveljavno uporabni邸ko ime."
 
-#: src/protocols/yahoo/yahoo.c:1808
+#: src/protocols/yahoo/yahoo.c:1815
 msgid "Normal authentication failed!"
 msgstr "Navadna overovitev ni uspela!"
 
-#: src/protocols/yahoo/yahoo.c:1809
-msgid ""
-"The normal authentication method has failed. This means either your password "
-"is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
-"attempt to log in using Web Messenger authentication, which will result in "
-"reduced functionality and features."
-msgstr ""
-"Navadna metoda overovitve je spodletela. To lahko pomeni, da je napa�no va邸e "
-"geslo ali pa se je spremenila shema overovitve Yahoo! Gaim se bo zdaj "
-"posku邸al prijaviti z uporabo overovitve Web Messengerja, kar se bo odrazilo "
-"v manj mo転nostih."
-
-#: src/protocols/yahoo/yahoo.c:1817
+#: src/protocols/yahoo/yahoo.c:1816
+msgid "The normal authentication method has failed. This means either your password is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now attempt to log in using Web Messenger authentication, which will result in reduced functionality and features."
+msgstr "Navadna metoda overovitve je spodletela. To lahko pomeni, da je napa�no va邸e geslo ali pa se je spremenila shema overovitve Yahoo! Gaim se bo zdaj posku邸al prijaviti z uporabo overovitve Web Messengerja, kar se bo odrazilo v manj mo転nostih."
+
+#: src/protocols/yahoo/yahoo.c:1824
 msgid "Incorrect password."
 msgstr "Neveljavno geslo."
 
-#: src/protocols/yahoo/yahoo.c:1820
+#: src/protocols/yahoo/yahoo.c:1827
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "Va邸 ra�un je zaklenjen. Prijavite se na spletno stran Yahoo!"
 
-#: src/protocols/yahoo/yahoo.c:1823
+#: src/protocols/yahoo/yahoo.c:1830
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
-msgstr ""
-"Neznana 邸tevilka napake %d. Prijavljanje v spletno stran Yahoo! lahko to "
-"odpravi."
-
-#: src/protocols/yahoo/yahoo.c:1877
+msgstr "Neznana 邸tevilka napake %d. Prijavljanje v spletno stran Yahoo! lahko to odpravi."
+
+#: src/protocols/yahoo/yahoo.c:1884
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
-msgstr ""
-"Ni mogo�e dodati prijatelja %s v skupino %s na seznamu stre転nikov za ra�un %"
-"s."
-
-#: src/protocols/yahoo/yahoo.c:1880
+msgstr "Ni mogo�e dodati prijatelja %s v skupino %s na seznamu stre転nikov za ra�un %s."
+
+#: src/protocols/yahoo/yahoo.c:1887
 msgid "Could not add buddy to server list"
 msgstr "Prijatelja ni mogo�e dodati ne seznam stre転nikov"
 
-#: src/protocols/yahoo/yahoo.c:2124 src/protocols/yahoo/yahoo.c:2270
+#: src/protocols/yahoo/yahoo.c:2131
+#: src/protocols/yahoo/yahoo.c:2277
 #: src/protocols/yahoo/ycht.c:413
 msgid "Unable to read"
 msgstr "Ni mogo�e brati"
 
-#: src/protocols/yahoo/yahoo.c:2292 src/protocols/yahoo/yahoo.c:2420
-#: src/protocols/yahoo/yahoo.c:2506 src/protocols/yahoo/yahoo.c:2516
-#: src/protocols/yahoo/yahoochat.c:1393 src/protocols/yahoo/yahoochat.c:1460
+#: src/protocols/yahoo/yahoo.c:2299
+#: src/protocols/yahoo/yahoo.c:2427
+#: src/protocols/yahoo/yahoo.c:2526
+#: src/protocols/yahoo/yahoo.c:2536
+#: src/protocols/yahoo/yahoochat.c:1395
+#: src/protocols/yahoo/yahoochat.c:1465
 #: src/protocols/yahoo/ycht.c:517
 msgid "Connection problem"
 msgstr "Te転ava s povezavo"
 
-#: src/protocols/yahoo/yahoo.c:2619 src/protocols/yahoo/yahoo.c:3236
+#: src/protocols/yahoo/yahoo.c:2639
+#: src/protocols/yahoo/yahoo.c:3218
 msgid "Not At Home"
 msgstr "Nisem doma"
 
-#: src/protocols/yahoo/yahoo.c:2621 src/protocols/yahoo/yahoo.c:3239
+#: src/protocols/yahoo/yahoo.c:2641
+#: src/protocols/yahoo/yahoo.c:3221
 msgid "Not At Desk"
 msgstr "Nisem za mizo"
 
-#: src/protocols/yahoo/yahoo.c:2623 src/protocols/yahoo/yahoo.c:3242
+#: src/protocols/yahoo/yahoo.c:2643
+#: src/protocols/yahoo/yahoo.c:3224
 msgid "Not In Office"
 msgstr "Nisem v pisarni"
 
-#: src/protocols/yahoo/yahoo.c:2627 src/protocols/yahoo/yahoo.c:3248
+#: src/protocols/yahoo/yahoo.c:2647
+#: src/protocols/yahoo/yahoo.c:3230
 msgid "On Vacation"
 msgstr "Na dopustu"
 
-#: src/protocols/yahoo/yahoo.c:2631 src/protocols/yahoo/yahoo.c:3254
+#: src/protocols/yahoo/yahoo.c:2651
+#: src/protocols/yahoo/yahoo.c:3236
 msgid "Stepped Out"
 msgstr "�el na pavzo"
 
-#: src/protocols/yahoo/yahoo.c:2723 src/protocols/yahoo/yahoo.c:2750
+#: src/protocols/yahoo/yahoo.c:2744
+#: src/protocols/yahoo/yahoo.c:2773
 msgid "Not on server list"
 msgstr "Ni na seznamu stre転nikov"
 
-#: src/protocols/yahoo/yahoo.c:2773 src/protocols/yahoo/yahoo.c:2833
+#: src/protocols/yahoo/yahoo.c:2790
+#: src/protocols/yahoo/yahoo.c:2850
 msgid "Appear Online"
 msgstr "Izgledaj povezan"
 
-#: src/protocols/yahoo/yahoo.c:2776 src/protocols/yahoo/yahoo.c:2855
+#: src/protocols/yahoo/yahoo.c:2793
+#: src/protocols/yahoo/yahoo.c:2872
 msgid "Appear Permanently Offline"
 msgstr "Izgledaj stalno povezan"
 
-#: src/protocols/yahoo/yahoo.c:2794
-msgid "Stealth"
-msgstr "Skrivno"
-
-#: src/protocols/yahoo/yahoo.c:2849
+#: src/protocols/yahoo/yahoo.c:2811
+msgid "Presence"
+msgstr "Prisotnost"
+
+#: src/protocols/yahoo/yahoo.c:2866
 msgid "Don't Appear Permanently Offline"
 msgstr "Izgledaj brez povezave"
 
-#: src/protocols/yahoo/yahoo.c:2896
+#: src/protocols/yahoo/yahoo.c:2913
 msgid "Join in Chat"
 msgstr "Pridru転i se pomenku"
 
-#: src/protocols/yahoo/yahoo.c:2901
+#: src/protocols/yahoo/yahoo.c:2918
 msgid "Initiate Conference"
 msgstr "Za�ni konferen�ni pogovor"
 
-#: src/protocols/yahoo/yahoo.c:2926
-msgid "Stealth Settings"
-msgstr "Nastavitve prikritosti"
-
-#: src/protocols/yahoo/yahoo.c:2932
+#: src/protocols/yahoo/yahoo.c:2943
+msgid "Presence Settings"
+msgstr "Nastavitve prisotnosti"
+
+#: src/protocols/yahoo/yahoo.c:2949
 msgid "Start Doodling"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:2963
+msgstr "Za�ni Doodlati"
+
+#: src/protocols/yahoo/yahoo.c:2980
 msgid "Active which ID?"
 msgstr "Kateri ID naj aktiviram?"
 
-#: src/protocols/yahoo/yahoo.c:2972
+#: src/protocols/yahoo/yahoo.c:2989
 msgid "Join who in chat?"
 msgstr "Komu se 転elite pridru転iti v pomenku?"
 
-#: src/protocols/yahoo/yahoo.c:2982
+#: src/protocols/yahoo/yahoo.c:2999
 msgid "Activate ID..."
 msgstr "Aktiviraj ID ..."
 
-#: src/protocols/yahoo/yahoo.c:2986
+#: src/protocols/yahoo/yahoo.c:3003
 msgid "Join user in chat..."
 msgstr "Pridru転i se uporabniku v pomenku ..."
 
-#: src/protocols/yahoo/yahoo.c:3541
+#: src/protocols/yahoo/yahoo.c:3524
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt;soba&gt;:  Pridru転ite se klepetalnici v omre転ju Yahoo."
 
-#: src/protocols/yahoo/yahoo.c:3545
+#: src/protocols/yahoo/yahoo.c:3528
 msgid "buzz: Buzz a contact to get their attention"
 msgstr "buzz: Pozvonite pri prijatelju, da vas bo opazil"
 
-#: src/protocols/yahoo/yahoo.c:3550
+#: src/protocols/yahoo/yahoo.c:3533
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Od uporabnika zahtevajte, da za�ne sejo Doodle"
 
@@ -10755,52 +11656,53 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3639 src/protocols/yahoo/yahoo.c:3641
+#: src/protocols/yahoo/yahoo.c:3625
+#: src/protocols/yahoo/yahoo.c:3627
 msgid "Yahoo Protocol Plugin"
 msgstr "Dodatek za protokol Yahoo"
 
-#: src/protocols/yahoo/yahoo.c:3658
+#: src/protocols/yahoo/yahoo.c:3644
 msgid "Yahoo Japan"
 msgstr "Yahoo Japonska"
 
-#: src/protocols/yahoo/yahoo.c:3661
+#: src/protocols/yahoo/yahoo.c:3647
 msgid "Pager host"
 msgstr "Stre転nik za pozivnik"
 
-#: src/protocols/yahoo/yahoo.c:3664
+#: src/protocols/yahoo/yahoo.c:3650
 msgid "Japan Pager host"
 msgstr "Japonski gostitelj pozivnika"
 
-#: src/protocols/yahoo/yahoo.c:3667
+#: src/protocols/yahoo/yahoo.c:3653
 msgid "Pager port"
 msgstr "Vrata za pozivnik"
 
-#: src/protocols/yahoo/yahoo.c:3670
+#: src/protocols/yahoo/yahoo.c:3656
 msgid "File transfer host"
 msgstr "Gostitelj prenosa datotek"
 
-#: src/protocols/yahoo/yahoo.c:3673
-msgid "Japan File transfer host"
+#: src/protocols/yahoo/yahoo.c:3659
+msgid "Japan file transfer host"
 msgstr "Japonski gostitelj prenosa datotek"
 
-#: src/protocols/yahoo/yahoo.c:3676
+#: src/protocols/yahoo/yahoo.c:3662
 msgid "File transfer port"
 msgstr "Vrata za prenos datotek"
 
-#: src/protocols/yahoo/yahoo.c:3679
-msgid "Chat Room Locale"
+#: src/protocols/yahoo/yahoo.c:3665
+msgid "Chat room locale"
 msgstr "Razpored tipk sobe pomenkov"
 
-#: src/protocols/yahoo/yahoo.c:3682
-msgid "Chat Room List Url"
+#: src/protocols/yahoo/yahoo.c:3668
+msgid "Chat room list URL"
 msgstr "URL seznama sob pomenkov"
 
-#: src/protocols/yahoo/yahoo.c:3685
-msgid "YCHT Host"
+#: src/protocols/yahoo/yahoo.c:3671
+msgid "YCHT host"
 msgstr "Gostitelj YCHT"
 
-#: src/protocols/yahoo/yahoo.c:3688
-msgid "YCHT Port"
+#: src/protocols/yahoo/yahoo.c:3674
+msgid "YCHT port"
 msgstr "Vrata YCHT"
 
 #: src/protocols/yahoo/yahoo_profile.c:672
@@ -10817,19 +11719,12 @@
 msgstr "Profil Yahoo!"
 
 #: src/protocols/yahoo/yahoo_profile.c:793
-msgid ""
-"Sorry, profiles marked as containing adult content are not supported at this "
-"time."
-msgstr ""
-"Oprostite, profili ozna�eni z vsebino za odrasle trenutno niso podprti."
+msgid "Sorry, profiles marked as containing adult content are not supported at this time."
+msgstr "Oprostite, profili ozna�eni z vsebino za odrasle trenutno niso podprti."
 
 #: src/protocols/yahoo/yahoo_profile.c:795
-msgid ""
-"If you wish to view this profile, you will need to visit this link in your "
-"web browser"
-msgstr ""
-"�e si 転elite ogledati ta profil, morate obiskati to povezavo z va邸im "
-"spletnim brskalnikom"
+msgid "If you wish to view this profile, you will need to visit this link in your web browser"
+msgstr "�e si 転elite ogledati ta profil, morate obiskati to povezavo z va邸im spletnim brskalnikom"
 
 #: src/protocols/yahoo/yahoo_profile.c:971
 msgid "Yahoo! ID"
@@ -10872,28 +11767,16 @@
 msgstr "Podatki o uporabniku %s niso dostopni"
 
 #: src/protocols/yahoo/yahoo_profile.c:1135
-msgid ""
-"Sorry, this profile seems to be in a language that is not supported at this "
-"time."
+msgid "Sorry, this profile seems to be in a language that is not supported at this time."
 msgstr "Oprostite, profil je v jeziku, ki trenutno ni podprt."
 
 #: src/protocols/yahoo/yahoo_profile.c:1151
-msgid ""
-"Could not retrieve the user's profile. This most likely is a temporary "
-"server-side problem. Please try again later."
-msgstr ""
-"Ni mogo�e pridobiti uporabnikovega profila. Ponavadi gre za za�asno te転avo "
-"na stre転niku. Poskusite pozneje."
+msgid "Could not retrieve the user's profile. This most likely is a temporary server-side problem. Please try again later."
+msgstr "Ni mogo�e pridobiti uporabnikovega profila. Ponavadi gre za za�asno te転avo na stre転niku. Poskusite pozneje."
 
 #: src/protocols/yahoo/yahoo_profile.c:1154
-msgid ""
-"Could not retrieve the user's profile. This most likely means that the user "
-"does not exist; however, Yahoo! sometimes does fail to find a user's "
-"profile. If you know that the user exists, please try again later."
-msgstr ""
-"Ni mogo�e pridobiti uporabnikovega profila. To ponavadi pomeni, da uporabnik "
-"ne obstaja. Kljub temu Yahoo! ob�asno ne uspe najti uporabnikovega profila. "
-"�e veste, da uporabnik obstaja, poskusite pozneje."
+msgid "Could not retrieve the user's profile. This most likely means that the user does not exist; however, Yahoo! sometimes does fail to find a user's profile. If you know that the user exists, please try again later."
+msgstr "Ni mogo�e pridobiti uporabnikovega profila. To ponavadi pomeni, da uporabnik ne obstaja. Kljub temu Yahoo! ob�asno ne uspe najti uporabnikovega profila. �e veste, da uporabnik obstaja, poskusite pozneje."
 
 #: src/protocols/yahoo/yahoo_profile.c:1162
 msgid "The user's profile is empty."
@@ -10933,19 +11816,20 @@
 msgid "Fetching the room list failed."
 msgstr "Prejemanje seznama sob je spodletelo."
 
-#: src/protocols/yahoo/yahoochat.c:1379
+#: src/protocols/yahoo/yahoochat.c:1381
 msgid "Voices"
 msgstr "Glasovi"
 
-#: src/protocols/yahoo/yahoochat.c:1382
+#: src/protocols/yahoo/yahoochat.c:1384
 msgid "Webcams"
 msgstr "Spletne kamere"
 
-#: src/protocols/yahoo/yahoochat.c:1393 src/protocols/yahoo/yahoochat.c:1460
+#: src/protocols/yahoo/yahoochat.c:1395
+#: src/protocols/yahoo/yahoochat.c:1465
 msgid "Unable to fetch room list."
 msgstr "Ni mogo�e prenesti seznama sob."
 
-#: src/protocols/yahoo/yahoochat.c:1453
+#: src/protocols/yahoo/yahoochat.c:1458
 msgid "User Rooms"
 msgstr "Sobe uporabnikov"
 
@@ -10954,33 +11838,33 @@
 msgstr "Te転ava s povezavo s stre転nikom YCHT."
 
 #: src/protocols/zephyr/zephyr.c:331
-msgid ""
-"(There was an error converting this message.\t Check the 'Encoding' option "
-"in the Account Editor)"
-msgstr ""
-"(Pri邸lo je do napake pri pretvorbi tega sporo�ila. \t Preverite izbiro "
-"kodnega nabora v Upravitelju ra�unov)"
+msgid "(There was an error converting this message.\t Check the 'Encoding' option in the Account Editor)"
+msgstr "(Pri邸lo je do napake pri pretvorbi tega sporo�ila. \t Preverite izbiro kodnega nabora v Upravitelju ra�unov)"
 
 #: src/protocols/zephyr/zephyr.c:686
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "Ni mogo�e poslati klepetu %s,%s,%s"
 
-#: src/protocols/zephyr/zephyr.c:719 src/protocols/zephyr/zephyr.c:1133
+#: src/protocols/zephyr/zephyr.c:719
+#: src/protocols/zephyr/zephyr.c:1133
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>Uporabnik:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:723 src/protocols/zephyr/zephyr.c:1138
+#: src/protocols/zephyr/zephyr.c:723
+#: src/protocols/zephyr/zephyr.c:1138
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Skrit ali neprijavljen"
 
-#: src/protocols/zephyr/zephyr.c:728 src/protocols/zephyr/zephyr.c:1140
+#: src/protocols/zephyr/zephyr.c:728
+#: src/protocols/zephyr/zephyr.c:1140
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>Pri %s od %s"
 
-#: src/protocols/zephyr/zephyr.c:1471 src/protocols/zephyr/zephyr.c:1472
+#: src/protocols/zephyr/zephyr.c:1471
+#: src/protocols/zephyr/zephyr.c:1472
 msgid "Anyone"
 msgstr "Kdorkoli"
 
@@ -11011,62 +11895,39 @@
 
 #: src/protocols/zephyr/zephyr.c:2612
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
-msgstr ""
-"instanca &lt;instanca&gt;: Nastavi instanco, ki naj bo uporabljena na tem "
-"razredu"
+msgstr "instanca &lt;instanca&gt;: Nastavi instanco, ki naj bo uporabljena na tem razredu"
 
 #: src/protocols/zephyr/zephyr.c:2617
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
-msgstr ""
-"inst &lt;instanca&gt;: Nastavi instanco, ki naj bo uporabljena na tem razredu"
+msgstr "inst &lt;instanca&gt;: Nastavi instanco, ki naj bo uporabljena na tem razredu"
 
 #: src/protocols/zephyr/zephyr.c:2622
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
-msgstr ""
-"topic &lt;instanca&gt;: Nastavi instanco, ki naj bo uporabljena na tem "
-"razredu"
+msgstr "topic &lt;instanca&gt;: Nastavi instanco, ki naj bo uporabljena na tem razredu"
 
 #: src/protocols/zephyr/zephyr.c:2628
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
-msgstr ""
-"sub &lt;razred&gt; &lt;instanca&gt; &lt;prejemnik&gt;: Pridru転i se novemu "
-"klepetu"
+msgstr "sub &lt;razred&gt; &lt;instanca&gt; &lt;prejemnik&gt;: Pridru転i se novemu klepetu"
 
 #: src/protocols/zephyr/zephyr.c:2633
-msgid ""
-"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
-msgstr ""
-"zi &lt;instanca&gt;: Po邸lji sporo�ilo uporabniku &lt;sporo�ilo,<i>instanca</"
-"i>,*&gt;"
+msgid "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+msgstr "zi &lt;instanca&gt;: Po邸lji sporo�ilo uporabniku &lt;sporo�ilo,<i>instanca</i>,*&gt;"
 
 #: src/protocols/zephyr/zephyr.c:2639
-msgid ""
-"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
-"<i>instance</i>,*&gt;"
-msgstr ""
-"zci &lt;razred&gt; &lt;instanca&gt;: Po邸lji sporo�ilo uporabniku &lt;"
-"<i>razred</i>,<i>instanca</i>,*&gt;"
+msgid "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,<i>instance</i>,*&gt;"
+msgstr "zci &lt;razred&gt; &lt;instanca&gt;: Po邸lji sporo�ilo uporabniku &lt;<i>razred</i>,<i>instanca</i>,*&gt;"
 
 #: src/protocols/zephyr/zephyr.c:2645
-msgid ""
-"zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
-"<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
-msgstr ""
-"zcir &lt;razred&gt; &lt;instanca&gt; &lt;prejemnik&gt;: Po邸lji sporo�ilo "
-"uporabniku &lt;<i>razred</i>,<i>instanca</i>,<i>prejemnik</i>&gt;"
+msgid "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
+msgstr "zcir &lt;razred&gt; &lt;instanca&gt; &lt;prejemnik&gt;: Po邸lji sporo�ilo uporabniku &lt;<i>razred</i>,<i>instanca</i>,<i>prejemnik</i>&gt;"
 
 #: src/protocols/zephyr/zephyr.c:2651
-msgid ""
-"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
-"<i>instance</i>,<i>recipient</i>&gt;"
-msgstr ""
-"zir &lt;instanca&gt; &lt;prejemnikt&gt;: Po邸lji sporo�ilo uporabniku &lt;"
-"SPORO�ILO,<i>instanca</i>,<i>prejemnik</i>&gt;"
+msgid "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,<i>instance</i>,<i>recipient</i>&gt;"
+msgstr "zir &lt;instanca&gt; &lt;prejemnikt&gt;: Po邸lji sporo�ilo uporabniku &lt;SPORO�ILO,<i>instanca</i>,<i>prejemnik</i>&gt;"
 
 #: src/protocols/zephyr/zephyr.c:2656
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
-msgstr ""
-"zc &lt;razred&gt;: Po邸lji sporo�ilo uporabniku &lt;<i>razred</i>,OSEBNO,*&gt;"
+msgstr "zc &lt;razred&gt;: Po邸lji sporo�ilo uporabniku &lt;<i>razred</i>,OSEBNO,*&gt;"
 
 #: src/protocols/zephyr/zephyr.c:2762
 msgid "Resubscribe"
@@ -11086,56 +11947,54 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:2847 src/protocols/zephyr/zephyr.c:2849
+#: src/protocols/zephyr/zephyr.c:2848
+#: src/protocols/zephyr/zephyr.c:2850
 msgid "Zephyr Protocol Plugin"
 msgstr "Dodatek za protokol Zephyr"
 
-#: src/protocols/zephyr/zephyr.c:2874
+#: src/protocols/zephyr/zephyr.c:2875
 msgid "Export to .anyone"
 msgstr "Izvozi v .kdorkoli"
 
-#: src/protocols/zephyr/zephyr.c:2877
+#: src/protocols/zephyr/zephyr.c:2878
 msgid "Export to .zephyr.subs"
 msgstr "Izvozi v .zephyr.subs"
 
-#: src/protocols/zephyr/zephyr.c:2880
+#: src/protocols/zephyr/zephyr.c:2881
 msgid "Import from .anyone"
 msgstr "Uvozi iz .kdorkoli"
 
-#: src/protocols/zephyr/zephyr.c:2883
+#: src/protocols/zephyr/zephyr.c:2884
 msgid "Import from .zephyr.subs"
 msgstr "Uvozi iz .zephyr.subs"
 
-#: src/protocols/zephyr/zephyr.c:2886
+#: src/protocols/zephyr/zephyr.c:2887
 msgid "Realm"
 msgstr "Podro�je"
 
-#: src/protocols/zephyr/zephyr.c:2889
+#: src/protocols/zephyr/zephyr.c:2890
 msgid "Exposure"
 msgstr "Izpostavljanje"
 
 #. XXX: why in the hell are we calling gaim_connection_error() here?
 #. Forbidden
-#: src/proxy.c:1036
+#: src/proxy.c:1099
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
 msgstr "Dostop zavrnjen: stre転nik proxy ne dovoljuje tuneliranja vrat %d."
 
-#: src/proxy.c:1040
+#: src/proxy.c:1103
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "Napaka pri povezavi stre転nika proxy %d"
 
-#: src/proxy.c:1874
+#: src/proxy.c:1939
 msgid "Invalid proxy settings"
 msgstr "Neveljavne proxy nastavitve"
 
-#: src/proxy.c:1874
-msgid ""
-"Either the host name or port number specified for your given proxy type is "
-"invalid."
-msgstr ""
-"Bodisi ime stre転nika bodisi vrata, ki ste ju navedli za proxy, so neveljavna."
+#: src/proxy.c:1939
+msgid "Either the host name or port number specified for your given proxy type is invalid."
+msgstr "Bodisi ime stre転nika bodisi vrata, ki ste ju navedli za proxy, so neveljavna."
 
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
@@ -11144,25 +12003,24 @@
 msgid "Accept"
 msgstr "Sprejmi"
 
-#: src/server.c:243
+#: src/savedstatuses.c:404
+msgid "saved statuses"
+msgstr "shranjena stanja"
+
+#: src/savedstatuses.c:590
+msgid "Hello!"
+msgstr "貼ivijo!"
+
+#: src/savedstatuses.c:612
+msgid "I'm not here right now"
+msgstr "Trenutno nisem tukaj"
+
+#: src/server.c:228
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s je zdaj poznan kot %s.\n"
 
-#: src/server.c:625
-#, c-format
-msgid "(%d message)"
-msgid_plural "(%d messages)"
-msgstr[0] "(%d sporo�il)"
-msgstr[1] "(%d sporo�ilo)"
-msgstr[2] "(%d sporo�ili)"
-msgstr[3] "(%d sporo�ila)"
-
-#: src/server.c:639
-msgid "(1 message)"
-msgstr "(%d sporo�il)"
-
-#: src/server.c:859
+#: src/server.c:711
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -11171,71 +12029,72 @@
 "Uporabnik %s vabi %s na pomenek v sobo %s:\n"
 "%s"
 
-#: src/server.c:864
+#: src/server.c:716
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "Uporabnik %s vabi %s na pomenek v sobo %s\n"
 
-#: src/server.c:868
+#: src/server.c:720
 msgid "Accept chat invitation?"
 msgstr "Sprejmi povabilo na pomenek?"
 
-#: src/status.c:153
+#: src/status.c:152
 msgid "Unset"
 msgstr "Nenastavljeno"
 
-#: src/status.c:156
+#: src/status.c:155
 msgid "Unavailable"
 msgstr "Nedostopen"
 
-#: src/status.c:621
+#: src/status.c:620
 #, c-format
 msgid "%s came back"
 msgstr "%s se je vrnil"
 
-#: src/status.c:626
+#: src/status.c:625
 #, c-format
 msgid "%s went away"
 msgstr "%s je postal odsoten"
 
-#: src/status.c:1308
+#: src/status.c:1269
 #, c-format
 msgid "%s became idle"
 msgstr "%s je postal nedejaven"
 
-#: src/status.c:1323
+#: src/status.c:1282
 #, c-format
 msgid "%s became unidle"
 msgstr "%s je postal dejaven"
 
-#: src/status.c:1697
-#, fuzzy
-msgid "Default auto-away"
-msgstr "Samodejna odsotnost"
-
-#: src/util.c:2121
+#: src/status.c:1355
+#, c-format
+msgid "+++ %s became idle"
+msgstr "+++ %s je postal nedejaven"
+
+#: src/status.c:1357
+#, c-format
+msgid "+++ %s became unidle"
+msgstr "+++ %s je postal dejaven"
+
+#: src/util.c:2120
 #, c-format
 msgid "Error Reading %s"
 msgstr "Napaka pri branju %s"
 
-#: src/util.c:2122
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"Pri branju va邸ega %s je pri邸lo do napake, zato ni bil nalo転en. Stara "
-"datoteka se je preimenovala v %s~."
-
-#: src/util.c:2567
+#: src/util.c:2121
+#, c-format
+msgid "An error was encountered reading your %s.  They have not been loaded, and the old file has been renamed to %s~."
+msgstr "Pri branju va邸ega %s je pri邸lo do napake, zato ni bil nalo転en. Stara datoteka se je preimenovala v %s~."
+
+#: src/util.c:2597
 msgid "Calculating..."
 msgstr "Prera�unavanje ..."
 
-#: src/util.c:2570
+#: src/util.c:2600
 msgid "Unknown."
 msgstr "Neznano."
 
-#: src/util.c:2600
+#: src/util.c:2630
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "sekund"
@@ -11243,7 +12102,7 @@
 msgstr[2] "sekundi"
 msgstr[3] "sekunde"
 
-#: src/util.c:2614
+#: src/util.c:2644
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dni"
@@ -11251,7 +12110,7 @@
 msgstr[2] "dneva"
 msgstr[3] "dnevi"
 
-#: src/util.c:2622
+#: src/util.c:2652
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "ur"
@@ -11259,7 +12118,7 @@
 msgstr[2] "uri"
 msgstr[3] "ure"
 
-#: src/util.c:2630
+#: src/util.c:2660
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
@@ -11267,183 +12126,7 @@
 msgstr[2] "minuti"
 msgstr[3] "minute"
 
-#: src/util.c:3053
+#: src/util.c:3098
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Napaka pri vzpostavljanju povezave.\n"
 
-#~ msgid "New..."
-#~ msgstr "Novo ..."
-
-#  else...
-#~ msgid "Back"
-#~ msgstr "Nazaj"
-
-#~ msgid "Tray Icon Configuration"
-#~ msgstr "Nastavitve ikone na pladnju"
-
-#~ msgid "_Hide new messages until tray icon is clicked"
-#~ msgstr "_Skrij nova sporo�ila, dokler ne kliknem ikone na pladnju"
-
-#~ msgid "Show user details"
-#~ msgstr "Poka転i podrobnosti o uporabniku"
-
-#~ msgid "_Apply"
-#~ msgstr "_Uporabi"
-
-#~ msgid "/Tools/Pl_ugin Actions"
-#~ msgstr "/Orodja/Dejanja _vstavkov"
-
-#~ msgid "/Tools/_Statuses"
-#~ msgstr "/Orodja/_Stanja"
-
-#~ msgid "%s could not connect"
-#~ msgstr "%s se ne more povezati"
-
-#~ msgid "Show transfer details"
-#~ msgstr "Poka転i podrobnosti o prenosu"
-
-#~ msgid "Expander Size"
-#~ msgstr "Velikost raz邸irnika"
-
-#~ msgid "Size of the expander arrow"
-#~ msgstr "Velikost raz邸iritvene pu邸�ice"
-
-#~ msgid "Buddy List Sorting"
-#~ msgstr "Razvr邸�anje seznama prijateljev"
-
-#~ msgid "_Sorting:"
-#~ msgstr "Razvr_邸�anje:"
-
-#~ msgid "Buddy Display"
-#~ msgstr "Prikaz prijateljev"
-
-#~ msgid "Show more buddy details"
-#~ msgstr "Poka転i podrobnosti o uporabniku"
-
-#~ msgid "Message Logs"
-#~ msgstr "Dnevnik sporo�il"
-
-#~ msgid "System Logs"
-#~ msgstr "Sistemski dnevniki"
-
-#~ msgid "_Enable system log"
-#~ msgstr "_Omogo�i sistemski dnevnik"
-
-#~ msgid "Log when buddies log in/log _out"
-#~ msgstr "Shranjuj �as prijave/_odjave prijateljev"
-
-#~ msgid "Log when buddies become _idle/un-idle"
-#~ msgstr "Shranjuj �as, ko postane prijatelj (ne)_dejaven"
-
-#~ msgid "Log when buddies go away/come _back"
-#~ msgstr "Shranjuj �as, ko gre prijatelj stran oz. se _vrne"
-
-#~ msgid "Log your own _signons/idleness/awayness"
-#~ msgstr "Shranuj _moje spremembe stanj"
-
-#~ msgid "Idle _Tracking:"
-#~ msgstr "Poro�anje o �asu ne_dejavnosti:"
-
-#~ msgid "Gaim usage"
-#~ msgstr "programa Gaim"
-
-#~ msgid "X usage"
-#~ msgstr "okenskega sistema X"
-
-#~ msgid "Windows usage"
-#~ msgstr "operacijskega sistema Windows"
-
-#~ msgid "Away m_essage:"
-#~ msgstr "Spo_ro�ilo o odsotnosti:"
-
-#~ msgid ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">Written by:</span>\t%s\n"
-#~ "<span weight=\"bold\">Web site:</span>\t\t%s\n"
-#~ "<span weight=\"bold\">File name:</span>\t%s"
-#~ msgstr ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">Napisal:</span>\t%s\n"
-#~ "<span weight=\"bold\">Spletni naslov:</span>\t\t%s\n"
-#~ "<span weight=\"bold\">Ime datoteke:</span>\t%s"
-
-#~ msgid ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">Written by:</span>  %s\n"
-#~ "<span weight=\"bold\">URL:</span>  %s\n"
-#~ "<span weight=\"bold\">File name:</span>  %s"
-#~ msgstr ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">Napisal:</span>  %s\n"
-#~ "<span weight=\"bold\">URL:</span>  %s\n"
-#~ "<span weight=\"bold\">Ime datoteke:</span>  %s "
-
-#~ msgid "Load"
-#~ msgstr "Nalo転i"
-
-#~ msgid "Summary"
-#~ msgstr "Povzetek"
-
-#~ msgid "Details"
-#~ msgstr "Podrobnosti"
-
-#~ msgid "Plugins"
-#~ msgstr "Vstavki"
-
-#~ msgid "Out of the office"
-#~ msgstr "Stran iz pisarne"
-
-#~ msgid "Slightly less boring default"
-#~ msgstr "Nekoliko manj dolgo�asno privzeto"
-
-#~ msgid "IRC"
-#~ msgstr "IRC"
-
-#~ msgid "Quit message"
-#~ msgstr "Izhod iz sporo�ila"
-
-#~ msgid "Basic Profile"
-#~ msgstr "Osnovni profil"
-
-#~ msgid "Profile Information"
-#~ msgstr "Podatki profila"
-
-#~ msgid "Instant Messagers"
-#~ msgstr "Programi za neposredna sporo�ila"
-
-#~ msgid "AIM"
-#~ msgstr "AIM"
-
-#~ msgid "ICQ UIN"
-#~ msgstr "ICQ UIN"
-
-#~ msgid "MSN"
-#~ msgstr "MSN"
-
-#~ msgid "Yahoo"
-#~ msgstr "Yahoo"
-
-#~ msgid "I'm From"
-#~ msgstr "Sem iz"
-
-#~ msgid "Set your Trepia profile data."
-#~ msgstr "Nastavite svoje podatke za profil Trepia."
-
-#~ msgid "Profile"
-#~ msgstr "Profil"
-
-#~ msgid "Set Profile"
-#~ msgstr "Nastavi profil"
-
-#~ msgid "Visit Homepage"
-#~ msgstr "Obi邸�i doma�o stran"
-
-#~ msgid "Local Users"
-#~ msgstr "Lokalni uporabniki"
-
-#~ msgid "Trepia Protocol Plugin"
-#~ msgstr "Dodatek za protokol Trepia"